summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@trolltech.com>2011-06-16 20:49:13 (GMT)
committerAlexis Menard <alexis.menard@trolltech.com>2011-06-16 20:49:13 (GMT)
commitfbdd5d5ad67535a47aa1ef3c08fdb6bb7a755671 (patch)
treed03acedc4c293e0bd9e54d01554e39028fac449a /bin
parent6a166ee97ce135c107c8436a1bd6b42a39124f57 (diff)
downloadQt-fbdd5d5ad67535a47aa1ef3c08fdb6bb7a755671.zip
Qt-fbdd5d5ad67535a47aa1ef3c08fdb6bb7a755671.tar.gz
Qt-fbdd5d5ad67535a47aa1ef3c08fdb6bb7a755671.tar.bz2
Make QtWebKit actually works when linked to an application.
Make sure that syncqt generates proper headers with proper paths so that headers.pri in $BUILD_DIR/lib/QtWebKit points to the right place. headers.pri in the build dir is used by qbase.pri to setup MacOS frameworks for example. Reviewed-By: Andreas Kling
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 23e6976..dd04e43 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -48,13 +48,13 @@ my %modules = ( # path to module name map
"QtDesigner" => "$basedir/tools/designer/src/lib",
"QtUiTools" => "$basedir/tools/designer/src/uitools",
"QtDBus" => "$basedir/src/dbus",
- "QtWebKit" => "$basedir/src/3rdparty/webkit/Source/WebCore",
+ "QtWebKit" => "$basedir/src/3rdparty/webkit/Source/WebKit/qt",
"phonon" => "$basedir/src/phonon",
"QtMultimedia" => "$basedir/src/multimedia",
"QtMeeGoGraphicsSystemHelper" => "$basedir/tools/qmeegographicssystemhelper",
);
my %moduleheaders = ( # restrict the module headers to those found in relative path
- "QtWebKit" => "../WebKit/qt/Api",
+ "QtWebKit" => "Api",
"phonon" => "../3rdparty/phonon/phonon",
);