From: Robert Ancell <robert.ancell@canonical.com>
Date: Mon, 15 Apr 2013 22:40:27 +0000 (+1200)
Subject: Merge with trunk
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/3f6a93726804501c7f435c460e64d8c447cc9f38

Merge with trunk
---

3f6a93726804501c7f435c460e64d8c447cc9f38
diff --cc liblightdm-qt/Makefile.am
index 3bb33b4a,26f15684..7969458b
--- a/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) \