diff options
| author | hausmann@webkit.org <hausmann@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-09-20 19:49:33 +0000 |
|---|---|---|
| committer | hausmann@webkit.org <hausmann@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-09-20 19:49:33 +0000 |
| commit | e43c7428069bc802aecef88116d12d9f1c54b0e3 (patch) | |
| tree | 1702befe4305058c420e70e5c0957c717a240ccf /third_party/WebKit/Tools/qmake | |
| parent | c609d36b2865b4a315339154515b15fba51f97cb (diff) | |
| download | chromium_src-e43c7428069bc802aecef88116d12d9f1c54b0e3.zip chromium_src-e43c7428069bc802aecef88116d12d9f1c54b0e3.tar.gz chromium_src-e43c7428069bc802aecef88116d12d9f1c54b0e3.tar.bz2 | |
[Qt] Fix production builds
Unreviewed trivial fix: Follow up r129119 and avoid clobbering LIBS through the use of LIBS_PRIVATE.
Otherwise the libQtWebKit.prl file for example contains -lWebKit1 -lWebCore, etc.
* qmake/mkspecs/features/functions.prf:
git-svn-id: svn://svn.chromium.org/blink/trunk@129155 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/Tools/qmake')
| -rw-r--r-- | third_party/WebKit/Tools/qmake/mkspecs/features/functions.prf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/third_party/WebKit/Tools/qmake/mkspecs/features/functions.prf b/third_party/WebKit/Tools/qmake/mkspecs/features/functions.prf index c54a262..bf827ad 100644 --- a/third_party/WebKit/Tools/qmake/mkspecs/features/functions.prf +++ b/third_party/WebKit/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 += -L$${ROOT_BUILD_DIR}/lib -l$$target + LIBS_PRIVATE += -L$${ROOT_BUILD_DIR}/lib -l$$target } else { mac { - LIBS += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a + LIBS_PRIVATE += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a } else:win32-msvc*|wince*|win32-icc { - LIBS += /OPT:REF -l$$target + LIBS_PRIVATE += /OPT:REF -l$$target } else { - LIBS += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive + LIBS_PRIVATE += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive } - LIBS += -L$$path + LIBS_PRIVATE += -L$$path win32-msvc*|wince*|win32-icc { POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}$${target}.lib @@ -268,7 +268,7 @@ defineTest(linkAgainstLibrary) { } } - export(LIBS) + export(LIBS_PRIVATE) export(QMAKE_LIBDIR) export(POST_TARGETDEPS) export(CONFIG) |