Merge with trunk

diff --cc configure.ac
Simple merge

diff --cc liblightdm-qt/Makefile.am
index 3bb33b4ad2f228501d3406023be7bfb7837236ab,26f15684f6ad059de0ea980c05d90694a2a95036..7969458b21e5c8d20ec1262c3f72cccf7176056c
--- 1/liblightdm-qt/Makefile.am
--- 2/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@@ -17,11 -17,12 +17,12 @@@ liblightdm_qt5_3_la_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) \

diff --cc liblightdm-qt/QLightDM/power.h
Simple merge