Skip to content

Commit

Permalink
centralize load(qt_build_config)s in .qmake.conf
Browse files Browse the repository at this point in the history
Change-Id: I229c0704fc3a5d230c921b8f9a08ad1b8ee124f6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
  • Loading branch information
ossilator committed Sep 11, 2012
1 parent da87f02 commit f429cad
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
1 change: 1 addition & 0 deletions .qmake.conf
@@ -0,0 +1 @@
load(qt_build_config)
2 changes: 0 additions & 2 deletions 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) {
Expand Down
1 change: 0 additions & 1 deletion src/plugins/platforms/wayland/wayland.pro
@@ -1,6 +1,5 @@
TARGET = qwayland
load(qt_plugin)
load(qt_build_config)

CONFIG += link_pkgconfig qpa/genericunixfontdatabase

Expand Down

0 comments on commit f429cad

Please sign in to comment.