Title: [128751] trunk
- Revision
- 128751
- Author
- [email protected]
- Date
- 2012-09-17 06:32:37 -0700 (Mon, 17 Sep 2012)
Log Message
[Qt] Auto-generate the module pri file for QtWebKit
Reviewed by Simon Hausmann.
Modified Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (128750 => 128751)
--- trunk/ChangeLog 2012-09-17 13:31:22 UTC (rev 128750)
+++ trunk/ChangeLog 2012-09-17 13:32:37 UTC (rev 128751)
@@ -1,3 +1,11 @@
+2012-09-17 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Auto-generate the module pri file for QtWebKit
+
+ Reviewed by Simon Hausmann.
+
+ * Source/api.pri:
+
2012-09-14 Julien Chaffraix <[email protected]>
Revert r127457 and following fixes due to several hit-testing regressions
Modified: trunk/Source/api.pri (128750 => 128751)
--- trunk/Source/api.pri 2012-09-17 13:31:22 UTC (rev 128750)
+++ trunk/Source/api.pri 2012-09-17 13:32:37 UTC (rev 128751)
@@ -29,7 +29,6 @@
load(webkit_modules)
MODULE = webkit
-MODULE_PRI = ../Tools/qmake/qt_webkit.pri
# This is the canonical list of dependencies for the public API of
# the QtWebKit library, and will end up in the library's prl file.
Modified: trunk/Tools/ChangeLog (128750 => 128751)
--- trunk/Tools/ChangeLog 2012-09-17 13:31:22 UTC (rev 128750)
+++ trunk/Tools/ChangeLog 2012-09-17 13:32:37 UTC (rev 128751)
@@ -1,3 +1,11 @@
+2012-09-17 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Auto-generate the module pri file for QtWebKit
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/qt_webkit.pri: Removed.
+
2012-09-14 Dirk Pranke <[email protected]>
nrwt: --additional-platform-dir is broken on chromium ports
Deleted: trunk/Tools/qmake/qt_webkit.pri (128750 => 128751)
--- trunk/Tools/qmake/qt_webkit.pri 2012-09-17 13:31:22 UTC (rev 128750)
+++ trunk/Tools/qmake/qt_webkit.pri 2012-09-17 13:32:37 UTC (rev 128751)
@@ -1,28 +0,0 @@
-# These variables define the library version, which is based on the original
-# Qt library version. It is not related to the release-version of QtWebKit.
-QT.webkit.MAJOR_VERSION = 5
-QT.webkit.MINOR_VERSION = 0
-QT.webkit.PATCH_VERSION = 0
-QT.webkit.VERSION = 5.0.0
-
-QT.webkit.name = QtWebKit
-QT.webkit.bins = $$QT_MODULE_BIN_BASE
-QT.webkit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtWebKit
-QT.webkit.imports = $$QT_MODULE_IMPORT_BASE
-QT.webkit.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION/$$QT.webkit.name
-QT.webkit.sources = $$QT_MODULE_BASE
-QT.webkit.libs = $$QT_MODULE_LIB_BASE
-QT.webkit.depends = core gui opengl network
-
-!contains(QT_CONFIG, modular)|contains(QT_ELIGIBLE_MODULES, webkit) {
- QT_CONFIG += webkit
-} else {
- warning("Attempted to include $$QT.webkit.name in the build, but it was not enabled in configure.")
-}
-
-# This is the old syntax for the WebKit version defines.
-# We keep them around in case someone was using them.
-QT_WEBKIT_VERSION = $$QT.webkit.VERSION
-QT_WEBKIT_MAJOR_VERSION = $$QT.webkit.MAJOR_VERSION
-QT_WEBKIT_MINOR_VERSION = $$QT.webkit.MINOR_VERSION
-QT_WEBKIT_PATCH_VERSION = $$QT.webkit.PATCH_VERSION
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
