diff options
| author | Fathi Boudra <fabo@debian.org> | 2010-07-24 09:51:54 +0300 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2010-07-24 09:51:54 +0300 |
| commit | 5081468e95b28b03a4ff6371dd3b59013155a17c (patch) | |
| tree | 64f95d5af54b92c26ba1acac8152f1f2ca78e105 | |
| parent | 4c9a4fca374c87672a71bf2237a1c029a7ce1958 (diff) | |
| download | qt4-x11-5081468e95b28b03a4ff6371dd3b59013155a17c.tar.gz | |
a better 0001_add_webkit_qt_config.patch
| -rw-r--r-- | debian/patches/0001_add_webkit_qt_config.patch | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/debian/patches/0001_add_webkit_qt_config.patch b/debian/patches/0001_add_webkit_qt_config.patch index 2c505cf..9a032d6 100644 --- a/debian/patches/0001_add_webkit_qt_config.patch +++ b/debian/patches/0001_add_webkit_qt_config.patch @@ -1,12 +1,13 @@ Description: when Qt is built with -no-webkit and Qt WebKit is used Qt applications cannot found webkit as they rely on qmake. - This patch modify qconfig.pri to load modules .pri files. + Make it possible for Qt modules to extend QT_CONFIG. + This is done by reading the module files from within qconfig.pri. Author: Simon Hausmann <simon.hausmann@nokia.com> Author: Fathi Boudra <fathi.boudra@nokia.com> --- a/configure +++ b/configure -@@ -7651,6 +7651,9 @@ QT_LIBINFIX = $QT_LIBINFIX +@@ -7648,6 +7648,9 @@ QT_LIBINFIX = $QT_LIBINFIX QT_NAMESPACE = $QT_NAMESPACE QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC @@ -26,3 +27,14 @@ Author: Fathi Boudra <fathi.boudra@nokia.com> QT_WEBKIT_VERSION = 4.7.0 QT_WEBKIT_MAJOR_VERSION = 4 QT_WEBKIT_MINOR_VERSION = 7 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -2925,6 +2925,8 @@ void Configure::generateCachefile() + configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; + } + ++ configStream << "#modules" << endl << "for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)" << endl; ++ + configStream.flush(); + configFile.close(); + } |