Title: [121545] trunk/Tools
- Revision
- 121545
- Author
- [email protected]
- Date
- 2012-06-29 03:15:22 -0700 (Fri, 29 Jun 2012)
Log Message
Revert r121540, it broke most Qt builds
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121544 => 121545)
--- trunk/Tools/ChangeLog 2012-06-29 10:09:59 UTC (rev 121544)
+++ trunk/Tools/ChangeLog 2012-06-29 10:15:22 UTC (rev 121545)
@@ -1,3 +1,10 @@
+2012-06-29 Tor Arne Vestbø <[email protected]>
+
+ Revert r121540, it broke most Qt builds
+
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/functions.prf:
+
2012-06-29 Oswald Buddenhagen <[email protected]>
[Qt] Make build-webkit reject uknown configurations, eg. --profile
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (121544 => 121545)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-06-29 10:09:59 UTC (rev 121544)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-06-29 10:15:22 UTC (rev 121545)
@@ -204,13 +204,15 @@
# More juggling
dependent_libs = $$LIBS
- LIBS = $$existing_libs
+ unset(LIBS)
# But we might also need to link against it
needToLink() {
linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
- LIBS_PRIVATE += $$dependent_libs
+ LIBS += $$dependent_libs
}
+
+ LIBS = $$existing_libs $$LIBS
}
equals(_PRO_FILE_, $${ROOT_WEBKIT_DIR}/WebKit.pro):!isEmpty(OVERRIDE_SUBDIRS) {
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (121544 => 121545)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-29 10:09:59 UTC (rev 121544)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-29 10:15:22 UTC (rev 121545)
@@ -261,29 +261,36 @@
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
}
win32-msvc*|wince*|win32-icc {
- LIBS_PRIVATE += -L$$path
+ LIBS += -L$$path
POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}$${target}.lib
} else {
QMAKE_LIBDIR += $$path
POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}lib$${target}.a
}
+
+ # The following line is to prevent qmake from adding jscore to libQtWebKit's prl dependencies.
+ # The compromise we have to accept by disabling explicitlib is to drop support to link QtWebKit
+ # statically in applications (which isn't used often because, among other things, of licensing obstacles).
+ CONFIG -= explicitlib
+ CONFIG -= staticlib
}
- export(LIBS_PRIVATE)
+ export(LIBS)
export(QMAKE_LIBDIR)
export(POST_TARGETDEPS)
+ export(CONFIG)
return(true)
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
