diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-16 14:13:12 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:40:03 +0200 |
| commit | a8ad1e77bad81572d84a03785c885e402242fc41 (patch) | |
| tree | 3b12aa69aca9d0d65b59d552e8d646eee6b4fa35 /mkspecs/features/qt_module_config.prf | |
| parent | d31f4a560d4c910732234681b936a7f93026d3eb (diff) | |
generate fwd-pris in qt_module_config, not in syncqt
the forwarding pri is loaded even if it was still created by syncqt, so a
top-level qmake -r will still catch it even in the future.
Change-Id: I2e4b556cd06eb88be9ee378662a2e6e1bff67ad7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/features/qt_module_config.prf')
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index c640f88037..eeef9cd691 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -12,6 +12,22 @@ isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") isEmpty(VERSION):VERSION = $$QT_VERSION +# Find the module's source root dir. +MODULE_PROFILE_DIR = $$_PRO_FILE_PWD_ +for(ever) { + exists($$MODULE_PROFILE_DIR/sync.profile):break() + nmpri = $$dirname(MODULE_PROFILE_DIR) + equals(nmpri, $$MODULE_PROFILE_DIR):error("No sync.profile found. This does not look like a Qt module source tree.") + MODULE_PROFILE_DIR = $$nmpri + unset(nmpri) +} + +isEmpty(MODULE_BASE_DIR): MODULE_BASE_DIR = $$MODULE_PROFILE_DIR +MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_DIR) +isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR + +load(qt_module_fwdpri) + MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes) MODULE_PRIVATE_INCLUDES = $$eval(QT.$${MODULE}.private_includes) INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES @@ -103,7 +119,6 @@ aix-g++* { !static:PRL_EXPORT_DEFINES += QT_SHARED #install directives -CONFIG += qt_install_module CONFIG += qt_install_headers load(qt_installs) |