diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2013-04-16 10:40:27 +1200 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2013-04-16 10:40:27 +1200 |
commit | 1b7533558f4ac87421160921eba2418179f6e09a (patch) | |
tree | df567b9fa2c4b36164b5f0534c14ce604666d029 /liblightdm-qt/Makefile.am | |
parent | c43f6f318a6bebf923fce55825a04cbd7e0483d5 (diff) | |
parent | 389e2e8bdeccc9b2696809bd4ceef43ebf0db2c8 (diff) | |
download | lightdm-1b7533558f4ac87421160921eba2418179f6e09a.tar.gz |
Merge with trunk
Diffstat (limited to 'liblightdm-qt/Makefile.am')
-rw-r--r-- | liblightdm-qt/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am index 3bb33b4a..7969458b 100644 --- a/liblightdm-qt/Makefile.am +++ b/liblightdm-qt/Makefile.am @@ -17,6 +17,7 @@ liblightdm_qt5_3_la_LIBADD = \ common_cflags = \ -I$(top_srcdir)/liblightdm-gobject \ $(LIBLIGHTDM_GOBJECT_CFLAGS) \ + -DQT_NO_KEYWORDS \ -DXSESSIONS_DIR=\"$(datadir)/xsessions\" liblightdm_qt_3_la_CXXFLAGS = \ $(LIBLIGHTDM_QT4_CFLAGS) \ |