[Qt] Move the QtWebKit module file to match the layout of Qt's mkspecs

Reviewed by Simon Hausmann.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@100133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 777ec6b589640f929ce73091c6349355f782174b..64da9a84ca135508b0028c0fd56e979bf8d2a259 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-14  Tor Arne Vestbø  <tor.arne.vestbo@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  <paroga@webkit.org>
 
         [CMake] Use MAIN_DEPENDENCY in GENERATE_* macros

diff --git a/Source/api.pri b/Source/api.pri
index eab3337d44bf072bc9a9b191a41a087d56b41bd3..b8f9bfcb1be3d8c81ab1e0c9cb0c78108a4009f7 100644 (file)
--- a/Source/api.pri
+++ b/Source/api.pri
@@ -166,7 +166,7 @@ contains(CONFIG, texmap) {
 
 # ------------- 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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 07eb6822b2514aa145584e723c505a32c2e69ca2..c3d4a843262ceb9b3c00d6a399e82c0b9b830e73 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-14  Tor Arne Vestbø  <tor.arne.vestbo@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.hausmann@nokia.com>
 
         [Qt] Disable plugins on X11 for WK2

diff --git a/Tools/qmake/qt_webkit.pri b/Tools/qmake/mkspecs/modules/qt_webkit.pri
similarity index 100%
rename from Tools/qmake/qt_webkit.pri
rename to Tools/qmake/mkspecs/modules/qt_webkit.pri

diff --git a/sync.profile b/sync.profile
index b5ac45e8dad977592211a8fabb25ee3707b4dec8..dba483e890484df42c39792b82dabb40ac29833a 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -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" );