diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-21 22:34:22 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-05-11 23:24:16 +0000 |
| commit | 9bdf322cea922d689758cfa6eefcd09d296f28bd (patch) | |
| tree | 237d7e2e6c4bad651f0bb009c84231f6b5cc2073 | |
| parent | a750b262b856178eee47d546944bd095662dccf7 (diff) | |
| download | qtwebkit-9bdf322cea922d689758cfa6eefcd09d296f28bd.tar.gz | |
Fix the build with non-standard qtlibinfix builds
When qtlibinfix contains non-identifier characters (like '.'), you can't
pass BUILDING_$${TARGET} since TARGET has already been modified by
qt_module.prf.
Change-Id: I22045d72c63a4741b83fffff140f6b7509c1e2c5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_post.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index 39bb3f7ae..19313d087 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -263,7 +263,8 @@ QMAKE_EXTRA_TARGETS += incremental contains(TEMPLATE, lib) { # Triggers the right export macros for WebKit internals - DEFINES += BUILDING_$${TARGET} + # (don't set for Qt modules; qt_module.prf does it) + !creating_module: DEFINES += BUILDING_$${TARGET} # Triggers the right export macro for the QtWebKit API (see qwebkitglobal.h) !contains(QT, webkit)|equals(MODULE, webkitwidgets): DEFINES += BUILDING_WEBKIT |