Title: [100133] trunk
- Revision
- 100133
- Author
- ves...@webkit.org
- Date
- 2011-11-14 05:19:12 -0800 (Mon, 14 Nov 2011)
Log Message
[Qt] Move the QtWebKit module file to match the layout of Qt's mkspecs
Reviewed by Simon Hausmann.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (100132 => 100133)
--- trunk/ChangeLog 2011-11-14 13:06:13 UTC (rev 100132)
+++ trunk/ChangeLog 2011-11-14 13:19:12 UTC (rev 100133)
@@ -1,3 +1,11 @@
+2011-11-14 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Move the QtWebKit module file to match the layout of Qt's mkspecs
+
+ Reviewed by Simon Hausmann.
+
+ * Source/api.pri:
+
2011-11-12 Patrick Gansterer <par...@webkit.org>
[CMake] Use MAIN_DEPENDENCY in GENERATE_* macros
Modified: trunk/Source/api.pri (100132 => 100133)
--- trunk/Source/api.pri 2011-11-14 13:06:13 UTC (rev 100132)
+++ trunk/Source/api.pri 2011-11-14 13:19:12 UTC (rev 100133)
@@ -166,7 +166,7 @@
# ------------- Install rules -------------
-modulefile.files = $${ROOT_WEBKIT_DIR}/Tools/qmake/qt_webkit.pri
+modulefile.files = $${ROOT_WEBKIT_DIR}/Tools/qmake/mkspecs/modules/qt_webkit.pri
mkspecs = $$[QMAKE_MKSPECS]
mkspecs = $$split(mkspecs, :)
modulefile.path = $$last(mkspecs)/modules
Modified: trunk/Tools/ChangeLog (100132 => 100133)
--- trunk/Tools/ChangeLog 2011-11-14 13:06:13 UTC (rev 100132)
+++ trunk/Tools/ChangeLog 2011-11-14 13:19:12 UTC (rev 100133)
@@ -1,3 +1,11 @@
+2011-11-14 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Move the QtWebKit module file to match the layout of Qt's mkspecs
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/modules/qt_webkit.pri: Renamed from Tools/qmake/qt_webkit.pri.
+
2011-11-14 Simon Hausmann <simon.hausm...@nokia.com>
[Qt] Disable plugins on X11 for WK2
Copied: trunk/Tools/qmake/mkspecs/modules/qt_webkit.pri (from rev 100132, trunk/Tools/qmake/qt_webkit.pri) (0 => 100133)
--- trunk/Tools/qmake/mkspecs/modules/qt_webkit.pri (rev 0)
+++ trunk/Tools/qmake/mkspecs/modules/qt_webkit.pri 2011-11-14 13:19:12 UTC (rev 100133)
@@ -0,0 +1,24 @@
+QT.webkit.VERSION = 4.10.0
+QT.webkit.MAJOR_VERSION = 4
+QT.webkit.MINOR_VERSION = 10
+QT.webkit.PATCH_VERSION = 0
+
+QT.webkit.name = QtWebKit
+QT.webkit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtWebKit
+QT.webkit.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION
+QT.webkit.sources = $$QT_MODULE_BASE
+QT.webkit.libs = $$QT_MODULE_LIB_BASE
+QT.webkit.depends = core gui opengl network xmlpatterns script
+
+!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
Deleted: trunk/Tools/qmake/qt_webkit.pri (100132 => 100133)
--- trunk/Tools/qmake/qt_webkit.pri 2011-11-14 13:06:13 UTC (rev 100132)
+++ trunk/Tools/qmake/qt_webkit.pri 2011-11-14 13:19:12 UTC (rev 100133)
@@ -1,24 +0,0 @@
-QT.webkit.VERSION = 4.10.0
-QT.webkit.MAJOR_VERSION = 4
-QT.webkit.MINOR_VERSION = 10
-QT.webkit.PATCH_VERSION = 0
-
-QT.webkit.name = QtWebKit
-QT.webkit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtWebKit
-QT.webkit.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION
-QT.webkit.sources = $$QT_MODULE_BASE
-QT.webkit.libs = $$QT_MODULE_LIB_BASE
-QT.webkit.depends = core gui opengl network xmlpatterns script
-
-!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
Modified: trunk/sync.profile (100132 => 100133)
--- trunk/sync.profile 2011-11-14 13:06:13 UTC (rev 100132)
+++ trunk/sync.profile 2011-11-14 13:19:12 UTC (rev 100133)
@@ -15,6 +15,6 @@
"script" => "#include <QtScript/QtScript>\n",
);
%modulepris = (
- "QtWebKit" => "$basedir/Tools/qmake/qt_webkit.pri",
+ "QtWebKit" => "$basedir/Tools/qmake/mkspecs/modules/qt_webkit.pri",
);
@ignore_for_master_contents = ( "qwebscriptworld.h" );
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
