diff options
-rw-r--r-- | Tools/ChangeLog | 16 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/default_post.prf | 9 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/functions.prf | 12 |
3 files changed, 30 insertions, 7 deletions
diff --git a/Tools/ChangeLog b/Tools/ChangeLog index c9f63aa9d..4b395f680 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,19 @@ +2012-09-21 Simon Hausmann <simon.hausmann@digia.com> + + [Qt] Re-fix clean builds + + Reviewed by NOBODY (OOPS!). + + Re-introduce the sanitization for LIBS when creating a module to use + LIBS_PRIVATE and otherwise do _not_ use LIBS_PRIVATE. We decided to + continue to use QT, LIBS and PKGCONFIG instead of their _PRIVATE variants + throughout the code base, so just using LIBS_PRIVATE in linkAgainstLibrary() + causes build issues when depending system libraries end up in LIBS before + LIBS_PRIVATE. + + * qmake/mkspecs/features/default_post.prf: + * qmake/mkspecs/features/functions.prf: + 2012-09-20 Simon Hausmann <simon.hausmann@digia.com> [Qt] Fix production builds diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index 5ed03c225..87538e547 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -221,10 +221,17 @@ needToLink() { for(library, WEBKIT) { library_identifier = $$lower($$library) linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir)) - LIBS_PRIVATE += $$eval(WEBKIT.$${library_identifier}.dependent_libs) + LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs) } } +creating_module { + # Sanitize LIBS, as we don't want any of these libraries + # to end up in as public API dependenices in the QtWebKit prl file. + LIBS_PRIVATE += $$LIBS + unset(LIBS) +} + equals(_PRO_FILE_, $${ROOT_WEBKIT_DIR}/WebKit.pro):!isEmpty(OVERRIDE_SUBDIRS) { # The root WebKit project file is the only one that allows # you to pass a set of subtargets on the comand line. diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf index bf827ada4..c54a262be 100644 --- a/Tools/qmake/mkspecs/features/functions.prf +++ b/Tools/qmake/mkspecs/features/functions.prf @@ -248,18 +248,18 @@ defineTest(linkAgainstLibrary) { path = $$replace(source_dir, $${ROOT_WEBKIT_DIR}, $${ROOT_BUILD_DIR})/$$activeBuildConfig() force_static_libs_as_shared { - LIBS_PRIVATE += -L$${ROOT_BUILD_DIR}/lib -l$$target + LIBS += -L$${ROOT_BUILD_DIR}/lib -l$$target } else { mac { - LIBS_PRIVATE += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a + LIBS += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a } else:win32-msvc*|wince*|win32-icc { - LIBS_PRIVATE += /OPT:REF -l$$target + LIBS += /OPT:REF -l$$target } else { - LIBS_PRIVATE += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive + LIBS += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive } - LIBS_PRIVATE += -L$$path + LIBS += -L$$path win32-msvc*|wince*|win32-icc { POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}$${target}.lib @@ -268,7 +268,7 @@ defineTest(linkAgainstLibrary) { } } - export(LIBS_PRIVATE) + export(LIBS) export(QMAKE_LIBDIR) export(POST_TARGETDEPS) export(CONFIG) |