diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-12 15:02:41 -0500 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-12 15:51:27 -0500 |
| commit | b3f26c5debfa5f38972aea4fce3ba11d509436d2 (patch) | |
| tree | 9f6cae234c280e9151538a8cd763dcec492969ff /patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch | |
| parent | 5dc1a8bbc0eaaa2bb1d23e6f459df3f63c4bf19f (diff) | |
Rebase ontop of current master
Diffstat (limited to 'patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch')
| -rw-r--r-- | patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch index 2816062..86566bc 100644 --- a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch +++ b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch @@ -1,4 +1,4 @@ -From 57a3cc555e65d07507375d9ffa0a796b38f8063a Mon Sep 17 00:00:00 2001 +From e5e18c4da35586931dae3c104e66cef8dc9267c3 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Wed, 24 Nov 2010 20:21:06 -0600 Subject: [PATCH] Add module specific pris, and make syncqt create fwd includes @@ -24,19 +24,19 @@ directory by syncqt for the fwd included pris. The path of the pris must be specified in the sync.profile for syncqt to create the fwding pris in QtBase. --- - qtbase/bin/syncqt | 59 ++++++++++++++++++++++++++++-- - qtbase/mkspecs/features/qt_config.prf | 9 ++++- - qtbase/src/modules/qt_core.pri | 11 ++++++ - qtbase/src/modules/qt_dbus.pri | 12 ++++++ - qtbase/src/modules/qt_gui.pri | 11 ++++++ - qtbase/src/modules/qt_network.pri | 11 ++++++ - qtbase/src/modules/qt_opengl.pri | 12 ++++++ - qtbase/src/modules/qt_openvg.pri | 12 ++++++ - qtbase/src/modules/qt_sql.pri | 11 ++++++ - qtbase/src/modules/qt_svg.pri | 11 ++++++ - qtbase/src/modules/qt_testlib.pri | 12 ++++++ - qtbase/src/modules/qt_xml.pri | 11 ++++++ - qtbase/sync.profile | 13 +++++++ + qtbase/bin/syncqt | 59 ++++++++++++++++++++++++++++-- + qtbase/mkspecs/features/qt_config.prf | 9 ++++- + qtbase/src/modules/qt_core.pri | 11 ++++++ + qtbase/src/modules/qt_dbus.pri | 12 ++++++ + qtbase/src/modules/qt_gui.pri | 11 ++++++ + qtbase/src/modules/qt_network.pri | 11 ++++++ + qtbase/src/modules/qt_opengl.pri | 12 ++++++ + qtbase/src/modules/qt_openvg.pri | 12 ++++++ + qtbase/src/modules/qt_sql.pri | 11 ++++++ + qtbase/src/modules/qt_svg.pri | 11 ++++++ + qtbase/src/modules/qt_testlib.pri | 12 ++++++ + qtbase/src/modules/qt_xml.pri | 11 ++++++ + qtbase/sync.profile | 13 +++++++ qtxmlpatterns/modules/qt_xmlpatterns.pri | 11 ++++++ qtxmlpatterns/sync.profile | 3 ++ 15 files changed, 205 insertions(+), 4 deletions(-) @@ -53,7 +53,7 @@ for syncqt to create the fwding pris in QtBase. create mode 100644 qtxmlpatterns/modules/qt_xmlpatterns.pri diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 7e5fc44..bceab27 100755 +index 7e5fc44..37e408c 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt @@ -23,8 +23,16 @@ our $basedir; |