Title: [129119] trunk
- Revision
- 129119
- Author
- [email protected]
- Date
- 2012-09-20 04:58:44 -0700 (Thu, 20 Sep 2012)
Log Message
[Qt] QtWebKit module header includes private dependencies
Reviewed by Tor Arne Vestbø.
.:
Moved loading of webkit_modules.prf a few lines down after the definition
of QT_API_DEPENDS, because webkit_modules.prf does the sanitization of the
QT variable now and therefore needs QT_API_DEPENDS.
* Source/api.pri:
Tools:
* qmake/mkspecs/features/default_post.prf: Don't try to sanitize LIBS, because we can make sure
that LIBS_PRIVATE is set from the beginning. Moved the creating_module and PKGCONFIG/QT(_PRIVATE)
sanitization into webkit_modules.prf. creating_module determination requires TARGET to be set, so
we can't do it in default_pre.
* qmake/mkspecs/features/webkit_modules.prf:
Modified Paths
Diff
Modified: trunk/ChangeLog (129118 => 129119)
--- trunk/ChangeLog 2012-09-20 11:34:33 UTC (rev 129118)
+++ trunk/ChangeLog 2012-09-20 11:58:44 UTC (rev 129119)
@@ -1,3 +1,15 @@
+2012-09-20 Simon Hausmann <[email protected]>
+
+ [Qt] QtWebKit module header includes private dependencies
+
+ Reviewed by Tor Arne Vestbø.
+
+ Moved loading of webkit_modules.prf a few lines down after the definition
+ of QT_API_DEPENDS, because webkit_modules.prf does the sanitization of the
+ QT variable now and therefore needs QT_API_DEPENDS.
+
+ * Source/api.pri:
+
2012-09-18 Sailesh Agrawal <[email protected]>
Chromium: Scrollbar with tickmarks doesn't respond to clicks
Modified: trunk/Source/api.pri (129118 => 129119)
--- trunk/Source/api.pri 2012-09-20 11:34:33 UTC (rev 129118)
+++ trunk/Source/api.pri 2012-09-20 11:58:44 UTC (rev 129119)
@@ -24,10 +24,6 @@
use?(3D_GRAPHICS): WEBKIT += angle
-# We load the relevant modules here, so that the effects of each module
-# on the QT variable can be picked up when we later load(qt_module).
-load(webkit_modules)
-
MODULE = webkit
# This is the canonical list of dependencies for the public API of
@@ -35,6 +31,10 @@
QT_API_DEPENDS = core gui network
build?(webkit1): QT_API_DEPENDS += widgets
+# We load the relevant modules here, so that the effects of each module
+# on the QT variable can be picked up when we later load(qt_module).
+load(webkit_modules)
+
# ---------------- Custom developer-build handling -------------------
#
# The assumption for Qt developer builds is that the module file
Modified: trunk/Tools/ChangeLog (129118 => 129119)
--- trunk/Tools/ChangeLog 2012-09-20 11:34:33 UTC (rev 129118)
+++ trunk/Tools/ChangeLog 2012-09-20 11:58:44 UTC (rev 129119)
@@ -1,5 +1,17 @@
2012-09-20 Simon Hausmann <[email protected]>
+ [Qt] QtWebKit module header includes private dependencies
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/default_post.prf: Don't try to sanitize LIBS, because we can make sure
+ that LIBS_PRIVATE is set from the beginning. Moved the creating_module and PKGCONFIG/QT(_PRIVATE)
+ sanitization into webkit_modules.prf. creating_module determination requires TARGET to be set, so
+ we can't do it in default_pre.
+ * qmake/mkspecs/features/webkit_modules.prf:
+
+2012-09-20 Simon Hausmann <[email protected]>
+
[Qt] Fix build with MingW
Reviewed by Tor Arne Vestbø.
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (129118 => 129119)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-20 11:34:33 UTC (rev 129118)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-20 11:58:44 UTC (rev 129119)
@@ -192,8 +192,6 @@
# FIXME: Replace this with putting the intermediate libraries in the prl file
}
-contains(TARGET, $$resolveFinalLibraryName($${QT.webkit.name})): CONFIG += creating_module
-
defineTest(needToLink) {
# The main dynamic library always needs to link in the intermediate libraries
creating_module: return(true)
@@ -223,25 +221,10 @@
for(library, WEBKIT) {
library_identifier = $$lower($$library)
linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
- LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
+ LIBS_PRIVATE += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
}
}
-creating_module {
- # Sanitize PKGCONFIG and LIBS, as we don't want any of these libraries
- # to end up in as public API dependenices in the QtWebKit prl file.
- PKGCONFIG_PRIVATE *= $$PKGCONFIG
- unset(PKGCONFIG)
- LIBS_PRIVATE += $$LIBS
- unset(LIBS)
-
- # We do have a limited subset of Qt modules as dependencies for using
- # the public QtWebKit API. The rest of the modules go into QT_PRIVATE.
- QT_PRIVATE *= $$QT
- QT = $$QT_API_DEPENDS
- QT_PRIVATE -= $$QT
-}
-
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.
Modified: trunk/Tools/qmake/mkspecs/features/webkit_modules.prf (129118 => 129119)
--- trunk/Tools/qmake/mkspecs/features/webkit_modules.prf 2012-09-20 11:34:33 UTC (rev 129118)
+++ trunk/Tools/qmake/mkspecs/features/webkit_modules.prf 2012-09-20 11:58:44 UTC (rev 129119)
@@ -36,3 +36,18 @@
# macros synchronized with the code that it will be linked with statically.
!contains(QT, webkit): DEFINES += STATICALLY_LINKED_WITH_$$library
}
+
+contains(TARGET, $$resolveFinalLibraryName($${QT.webkit.name})): CONFIG += creating_module
+
+creating_module {
+ # Sanitize PKGCONFIG as we don't want any of these libraries
+ # to end up in as public API dependenices in the QtWebKit prl file.
+ PKGCONFIG_PRIVATE *= $$PKGCONFIG
+ unset(PKGCONFIG)
+
+ # We do have a limited subset of Qt modules as dependencies for using
+ # the public QtWebKit API. The rest of the modules go into QT_PRIVATE.
+ QT_PRIVATE *= $$QT
+ QT = $$QT_API_DEPENDS
+ QT_PRIVATE -= $$QT
+}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
