Merge with trunk

diff --combined configure.ac
index 614a940f93461fa05c57ce3632674d0a9eeb0da6,8151d1cbba8e6cf6389b1792fda7ad82b9217869..224b1bdf0273c1d6af025eddc88cd2bb20551aca
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,6 -1,6 +1,6 @@@
  dnl Process this file with autoconf to produce a configure script.
  
- AC_INIT(lightdm, 1.5.3)
+ AC_INIT(lightdm, 1.6.0)
  AC_CONFIG_MACRO_DIR(m4)
  AC_CONFIG_HEADER(config.h)
  AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
@@@ -199,8 -199,8 +199,8 @@@ help/Makefil
  liblightdm-gobject/liblightdm-gobject-1.pc
  liblightdm-gobject/Makefile
  liblightdm-qt/Makefile
 -liblightdm-qt/liblightdm-qt-2.pc
 -liblightdm-qt/liblightdm-qt5-2.pc
 +liblightdm-qt/liblightdm-qt-3.pc
 +liblightdm-qt/liblightdm-qt5-3.pc
  po/Makefile.in
  src/Makefile
  tests/Makefile

diff --combined liblightdm-qt/Makefile.am
index 3bb33b4ad2f228501d3406023be7bfb7837236ab,26f15684f6ad059de0ea980c05d90694a2a95036..7969458b21e5c8d20ec1262c3f72cccf7176056c
--- 1/liblightdm-qt/Makefile.am
--- 2/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@@ -7,21 -7,22 +7,22 @@@
  common_libadd = \
        -L$(top_builddir)/liblightdm-gobject \
        -llightdm-gobject-1
 -liblightdm_qt_2_la_LIBADD = \
 +liblightdm_qt_3_la_LIBADD = \
        $(LIBLIGHTDM_QT4_LIBS) \
        $(common_libadd)
 -liblightdm_qt5_2_la_LIBADD = \
 +liblightdm_qt5_3_la_LIBADD = \
        $(LIBLIGHTDM_QT5_LIBS) \
        $(common_libadd)
  
  common_cflags = \
        -I$(top_srcdir)/liblightdm-gobject \
        $(LIBLIGHTDM_GOBJECT_CFLAGS) \
+       -DQT_NO_KEYWORDS \
        -DXSESSIONS_DIR=\"$(datadir)/xsessions\"
 -liblightdm_qt_2_la_CXXFLAGS = \
 +liblightdm_qt_3_la_CXXFLAGS = \
        $(LIBLIGHTDM_QT4_CFLAGS) \
        $(common_cflags)
 -liblightdm_qt5_2_la_CXXFLAGS = \
 +liblightdm_qt5_3_la_CXXFLAGS = \
        -fPIC \
        -DQT_DISABLE_DEPRECATED_BEFORE="QT_VERSION_CHECK(4, 0, 0)" \
        $(LIBLIGHTDM_QT5_CFLAGS) \
@@@ -37,20 -38,20 +38,20 @@@ common_headers = 
        QLightDM/sessionsmodel.h \
        QLightDM/usersmodel.h
  
 -liblightdm_qt_2includedir=$(includedir)/lightdm-qt-2/QLightDM
 -liblightdm_qt5_2includedir=$(includedir)/lightdm-qt5-2/QLightDM
 +liblightdm_qt_3includedir=$(includedir)/lightdm-qt-3/QLightDM
 +liblightdm_qt5_3includedir=$(includedir)/lightdm-qt5-3/QLightDM
  
  common_sources = \
        greeter.cpp \
        power.cpp \
        sessionsmodel.cpp \
        usersmodel.cpp
 -liblightdm_qt_2_la_SOURCES = \
 +liblightdm_qt_3_la_SOURCES = \
        $(common_sources) \
 -      $(liblightdm_qt_2include_HEADERS)
 -liblightdm_qt5_2_la_SOURCES = \
 +      $(liblightdm_qt_3include_HEADERS)
 +liblightdm_qt5_3_la_SOURCES = \
        $(common_sources) \
 -      $(liblightdm_qt5_2include_HEADERS)
 +      $(liblightdm_qt5_3include_HEADERS)
  
  pkgconfigdir = $(libdir)/pkgconfig
  
@@@ -66,15 -67,15 +67,15 @@@ BUILT_SOURCES 
  pkgconfig_DATA =
  
  if COMPILE_LIBLIGHTDM_QT4
 -lib_LTLIBRARIES += liblightdm-qt-2.la
 -liblightdm_qt_2include_HEADERS = $(common_headers)
 +lib_LTLIBRARIES += liblightdm-qt-3.la
 +liblightdm_qt_3include_HEADERS = $(common_headers)
  BUILT_SOURCES += $(common_sources:.cpp=_moc4.cpp)
 -pkgconfig_DATA += liblightdm-qt-2.pc
 +pkgconfig_DATA += liblightdm-qt-3.pc
  endif
  
  if COMPILE_LIBLIGHTDM_QT5
 -lib_LTLIBRARIES += liblightdm-qt5-2.la
 -liblightdm_qt5_2include_HEADERS = $(common_headers)
 +lib_LTLIBRARIES += liblightdm-qt5-3.la
 +liblightdm_qt5_3include_HEADERS = $(common_headers)
  BUILT_SOURCES += $(common_sources:.cpp=_moc5.cpp)
 -pkgconfig_DATA += liblightdm-qt5-2.pc
 +pkgconfig_DATA += liblightdm-qt5-3.pc
  endif

diff --combined liblightdm-qt/QLightDM/power.h
index 8054bc67b76448efd477927d6d9e79e347216a12,b00081badefff5496fd2a82e2043e9b7fe026dd0..44d9e2c49f547b786ee3caad5ef80a0f93a59c7e
--- 1/liblightdm-qt/QLightDM/power.h
--- 2/liblightdm-qt/QLightDM/power.h
+++ b/liblightdm-qt/QLightDM/power.h
@@@ -34,16 -34,16 +34,16 @@@ namespace QLightD
          bool canRestart();
  
      public Q_SLOTS:
 -        void suspend();
 -        void hibernate();
 -        void shutdown();
 -        void restart();
 +        bool suspend();
 +        bool hibernate();
 +        bool shutdown();
 +        bool restart();
  
      private:
          class PowerInterfacePrivate;
          PowerInterfacePrivate * const d;
  
      };
- };
+ }
  
  #endif // QLIGHTDM_POWER_H