diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-10 21:35:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-18 19:48:59 +0200 |
| commit | 5f0b52ea26e96001f7c6dee98a5bea5956cda718 (patch) | |
| tree | d61482fc53b8e165234ffab11e2b9e00aa44e21b /mkspecs/features/qt_module_headers.prf | |
| parent | 28d5967e68233bbc66d57d6c3ec4d7c85a2c3189 (diff) | |
put the include/ of all modules into qtbase when doing non-prefix build
all other build artifacts go into qtbase's build directory anyway. this
asymmetry was confusing and causes cmake users some grief.
Change-Id: I4d7f7b2318f6c5300eb00360664785cb2c8217b7
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/features/qt_module_headers.prf')
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 6a1854a771..cd41c17b85 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -1,5 +1,11 @@ +QTDIR = $$[QT_HOST_PREFIX] +!force_independent:exists($$QTDIR/.qmake.cache): \ + mod_component_base = $$QTDIR +else: \ + mod_component_base = $$MODULE_BASE_OUTDIR + #load up the headers info -include($$MODULE_BASE_OUTDIR/include/$$TARGET/headers.pri, "", true) +include($$mod_component_base/include/$$TARGET/headers.pri, "", true) lctarget = $$lower($$TARGET) uctarget = $$upper($$TARGET) @@ -40,7 +46,7 @@ count(MODULE_VERSION_HEADER, 1) { } # Create a module master header -MODULE_MASTER_HEADER = $$MODULE_BASE_OUTDIR/include/$$TARGET/$$TARGET +MODULE_MASTER_HEADER = $$mod_component_base/include/$$TARGET/$$TARGET !build_pass { MODULE_MASTER_HEADER_CONT = \ "/* This file was generated by qmake with the info from $${_PRO_FILE_}. */" \ |