diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-27 12:27:54 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-27 12:27:54 +0200 |
| commit | 18a3f6169bb8a763366003d92b8013950578c79f (patch) | |
| tree | e39fa00a9511410fea9be35a6130007e43719ad8 /mkspecs | |
| parent | 371d398f70e10408e0eaba7b5f05e638a0048599 (diff) | |
| parent | a06c8405d053b16327d65415f3335eceb37abd3b (diff) | |
Merge remote-tracking branch 'base/master' into refactor
Conflicts:
demos/demos.pro
demos/embedded/digiflip/digiflip.pro
examples/examples.pro
examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
src/gui/kernel/qplatformglcontext_qpa.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index c91d543d6c..ebb94e272e 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -12,13 +12,21 @@ exists($$_PRO_FILE_PWD_/sync.profile) { isEmpty(QTDIR) { QTDIR = $$(QTDIR) isEmpty(QTDIR):QTDIR = $$QT_BUILD_TREE + isEmpty(QTDIR) { # figure out QTDIR based on qmake binary + QMAKE_BASED_QTDIR = $$dirname(QMAKE_QMAKE) + QTDIR = $$dirname(QMAKE_BASED_QTDIR) + unset(QMAKE_BASED_QTDIR) + } } - QTFWD = - isEmpty(QTDIR) { - QTFWD += -module-fwd $$OUT_PWD/module-paths/modules -cache-module-fwd - } else { - QTFWD += -qtdir $$QTDIR -module-fwd $$QTDIR/mkspecs/modules -developer-build + QTFWD = -module-fwd $$OUT_PWD/module-paths/modules -cache-module-fwd + !isEmpty(QTDIR) { + # Only if QTDIR points to an actual build directory + # and this build directory is the install directory + # can we tell syncqt to do a -developer-build + exists($$QTDIR/.qmake.cache):contains(QTDIR, $$[QT_INSTALL_PREFIX]) { + QTFWD = -qtdir $$QTDIR -module-fwd $$QTDIR/mkspecs/modules -developer-build + } } qtPrepareTool(QMAKE_SYNCQT, syncqt) |