diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-03 12:15:12 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-11 21:12:48 +0200 |
| commit | f429cadded396de97e4cca9571144f08f3fbf5d4 (patch) | |
| tree | 14066d525d48c05ec399032dcdd5aeef4983a01c | |
| parent | da87f0291454d998755a703a7def4b2aecc1547f (diff) | |
centralize load(qt_build_config)s in .qmake.conf
Change-Id: I229c0704fc3a5d230c921b8f9a08ad1b8ee124f6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | .qmake.conf | 1 | ||||
| -rw-r--r-- | src/compositor/compositor.pri | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 000000000..42ba8e45f --- /dev/null +++ b/.qmake.conf @@ -0,0 +1 @@ +load(qt_build_config) diff --git a/src/compositor/compositor.pri b/src/compositor/compositor.pri index f890f7708..595bbf7c7 100644 --- a/src/compositor/compositor.pri +++ b/src/compositor/compositor.pri @@ -1,7 +1,5 @@ CONFIG += link_pkgconfig -load(qt_build_config) - DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT !contains(QT_CONFIG, no-pkg-config) { diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index d6d1e3331..2a74522d0 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -1,6 +1,5 @@ TARGET = qwayland load(qt_plugin) -load(qt_build_config) CONFIG += link_pkgconfig qpa/genericunixfontdatabase |