Title: [129155] trunk/Tools
- Revision
- 129155
- Author
- [email protected]
- Date
- 2012-09-20 12:49:33 -0700 (Thu, 20 Sep 2012)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (129154 => 129155)
--- trunk/Tools/ChangeLog 2012-09-20 19:29:51 UTC (rev 129154)
+++ trunk/Tools/ChangeLog 2012-09-20 19:49:33 UTC (rev 129155)
@@ -1,3 +1,13 @@
+2012-09-20 Simon Hausmann <[email protected]>
+
+ [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:
+
2012-09-20 Dirk Pranke <[email protected]>
REGRESSION: layout test results doesn't show diffs
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (129154 => 129155)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-20 19:29:51 UTC (rev 129154)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-20 19:49:33 UTC (rev 129155)
@@ -248,18 +248,18 @@
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 @@
}
}
- export(LIBS)
+ export(LIBS_PRIVATE)
export(QMAKE_LIBDIR)
export(POST_TARGETDEPS)
export(CONFIG)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
