centralize load(qt_build_config)s in .qmake.conf
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 3 Sep 2012 10:15:12 +0000 (12:15 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 11 Sep 2012 19:12:48 +0000 (21:12 +0200)
Change-Id: I229c0704fc3a5d230c921b8f9a08ad1b8ee124f6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
.qmake.conf [new file with mode: 0644]
src/compositor/compositor.pri
src/plugins/platforms/wayland/wayland.pro

diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644 (file)
index 0000000..42ba8e4
--- /dev/null
@@ -0,0 +1 @@
+load(qt_build_config)
index f890f77..595bbf7 100644 (file)
@@ -1,7 +1,5 @@
 CONFIG += link_pkgconfig
 
-load(qt_build_config)
-
 DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT
 
 !contains(QT_CONFIG, no-pkg-config) {
index d6d1e33..2a74522 100644 (file)
@@ -1,6 +1,5 @@
 TARGET = qwayland
 load(qt_plugin)
-load(qt_build_config)
 
 CONFIG += link_pkgconfig qpa/genericunixfontdatabase