diff options
Diffstat (limited to 'patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch')
| -rw-r--r-- | patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch index 2076e0f..b184ddf 100644 --- a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch +++ b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch @@ -1,8 +1,7 @@ -From 232edb9da29393cc92a996955622aa9f90070f80 Mon Sep 17 00:00:00 2001 +From b6ca35b95311e4fdc490e2523c8a8860d8436657 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Tue, 22 Mar 2011 13:20:53 +0100 -Subject: [PATCH] Introduced the QT.<module>.plugins variable to module - profiles. +Subject: [PATCH] Introduced the QT.<module>.plugins variable to module profiles. --- qt3support/modules/qt_qt3support.pri | 1 + @@ -77,7 +76,7 @@ Subject: [PATCH] Introduced the QT.<module>.plugins variable to module qtbase/src/plugins/s60/s60pluginbase.pri | 2 +- qtbase/src/plugins/sqldrivers/qsqldriverbase.pri | 2 +- qtdeclarative/modules/qt_declarative.pri | 1 + - .../src/plugins/qmltooling/tcpserver/tcpserver.pro | 2 +- + .../plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 +- qtmultimedia/modules/qt_multimedia.pri | 1 + qtphonon/modules/qt_phonon.pri | 1 + qtphonon/src/plugins/phonon/mmf/mmf.pro | 2 +- @@ -135,10 +134,10 @@ index c10d06d..e2f8132 100644 QT.activeqt.depends = gui QT.activeqt.DEFINES = QT_ACTIVEQT_LIB diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 8f0047f..05d8ecb 100755 +index d37d077..45ac9d0 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -1011,6 +1011,7 @@ foreach my $lib (@modules_to_sync) { +@@ -1013,6 +1013,7 @@ foreach my $lib (@modules_to_sync) { print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtbasedir/imports\n"; print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n"; @@ -1002,10 +1001,10 @@ index 01c525d..d4dfecd 100644 QT.declarative.imports = $$QT_MODULE_IMPORT_BASE QT.declarative.depends = gui script network QT.declarative.DEFINES = QT_DECLARATIVE_LIB -diff --git a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro -index f4f2666..0a89b9e 100644 ---- a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro -+++ b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro +diff --git a/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +index e8ab962..25f05c2 100644 +--- a/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro ++++ b/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -3,7 +3,7 @@ QT += declarative network include(../../qpluginbase.pri) @@ -1053,7 +1052,7 @@ index 9bf50c7..e3f9f82 100644 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri -index ff4494f..18c6632 100644 +index ff4494f2..18c6632 100644 --- a/qtscript/modules/qt_script.pri +++ b/qtscript/modules/qt_script.pri @@ -9,6 +9,7 @@ QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript @@ -1065,7 +1064,7 @@ index ff4494f..18c6632 100644 QT.script.depends = core QT.script.DEFINES = QT_SCRIPT_LIB diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri -index 70acaf4..63ae470a 100644 +index 70acaf4..63ae470 100644 --- a/qtscript/modules/qt_scripttools.pri +++ b/qtscript/modules/qt_scripttools.pri @@ -9,6 +9,7 @@ QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSc @@ -1225,5 +1224,5 @@ index 3f37d50..3c15c46 100644 QT.xmlpatterns.depends = core network QT.xmlpatterns.DEFINES = QT_XMLPATTERNS_LIB -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 |