From d152825f2bed4d4ad869727bae91d047f5dcf1d3 Mon Sep 17 00:00:00 2001
From: "vestbo@webkit.org"
 <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 14 Nov 2011 13:19:12 +0000
Subject: [PATCH] [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
---
 ChangeLog                                       | 8 ++++++++
 Source/api.pri                                  | 2 +-
 Tools/ChangeLog                                 | 8 ++++++++
 Tools/qmake/{ => mkspecs/modules}/qt_webkit.pri | 0
 sync.profile                                    | 2 +-
 5 files changed, 18 insertions(+), 2 deletions(-)
 rename Tools/qmake/{ => mkspecs/modules}/qt_webkit.pri (100%)

diff --git a/ChangeLog b/ChangeLog
index 777ec6b58964..64da9a84ca13 100644
--- 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 eab3337d44bf..b8f9bfcb1be3 100644
--- 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 07eb6822b251..c3d4a843262c 100644
--- 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 b5ac45e8dad9..dba483e89048 100644
--- 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" );
-- 
2.36.0