diff options
Diffstat (limited to 'patches/0027-Move-QtSvg-into-a-separate-repository.patch')
| -rw-r--r-- | patches/0027-Move-QtSvg-into-a-separate-repository.patch | 58 |
1 files changed, 39 insertions, 19 deletions
diff --git a/patches/0027-Move-QtSvg-into-a-separate-repository.patch b/patches/0027-Move-QtSvg-into-a-separate-repository.patch index fbb0046..7d3b451 100644 --- a/patches/0027-Move-QtSvg-into-a-separate-repository.patch +++ b/patches/0027-Move-QtSvg-into-a-separate-repository.patch @@ -1,22 +1,41 @@ -From 8a4f9d1c32e363c7b7d319d40ca770965fba1ef9 Mon Sep 17 00:00:00 2001 +From d8b4cb6f259f84062b6a03ac87c6bfbfdf6b60a1 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Mon, 27 Dec 2010 14:49:29 +0100 Subject: [PATCH] Move QtSvg into a separate repository --- + qtbase/src/modules/qt_svg.pri | 11 ----------- qtbase/src/plugins/imageformats/imageformats.pro | 1 - qtbase/src/plugins/plugins.pro | 2 +- qtbase/src/src.pro | 9 +-------- qtbase/sync.profile | 3 --- - {qtbase/src => qtsvg}/modules/qt_svg.pri | 2 +- + qtsvg/modules/qt_svg.pri | 11 +++++++++++ .../iconengines/svgiconengine/svgiconengine.pro | 6 ++++-- qtsvg/src/plugins/imageformats/svg/svg.pro | 6 ++++-- qtsvg/src/svg/svg.pro | 9 +++++---- qtsvg/sync.profile | 14 ++++++++++++++ - 9 files changed, 30 insertions(+), 22 deletions(-) - rename {qtbase/src => qtsvg}/modules/qt_svg.pri (82%) + 10 files changed, 40 insertions(+), 32 deletions(-) + delete mode 100644 qtbase/src/modules/qt_svg.pri + create mode 100644 qtsvg/modules/qt_svg.pri create mode 100644 qtsvg/sync.profile +diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri +deleted file mode 100644 +index 90df93f..0000000 +--- a/qtbase/src/modules/qt_svg.pri ++++ /dev/null +@@ -1,11 +0,0 @@ +-QT_SVG_VERSION = $$QT_VERSION +-QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION +-QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION +-QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION +- +-QT.svg.name = QtSvg +-QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg +-QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private +-QT.svg.sources = $$QT_MODULE_BASE/src/svg +-QT.svg.libs = $$QT_MODULE_LIB_BASE +-QT.svg.depends = core gui diff --git a/qtbase/src/plugins/imageformats/imageformats.pro b/qtbase/src/plugins/imageformats/imageformats.pro index 5fff2de..66dea09 100644 --- a/qtbase/src/plugins/imageformats/imageformats.pro @@ -117,22 +136,23 @@ index c8ef4fc..7984329 100644 "QtTest" => "$basedir/src/modules/qt_testlib.pri", "QtXml" => "$basedir/src/modules/qt_xml.pri", ); -diff --git a/qtbase/src/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri -similarity index 82% -rename from qtbase/src/modules/qt_svg.pri -rename to qtsvg/modules/qt_svg.pri -index 90df93f..5fa3212 100644 ---- a/qtbase/src/modules/qt_svg.pri +diff --git a/qtsvg/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri +new file mode 100644 +index 0000000..5fa3212 +--- /dev/null +++ b/qtsvg/modules/qt_svg.pri -@@ -4,7 +4,7 @@ QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION - QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.svg.name = QtSvg --QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg +@@ -0,0 +1,11 @@ ++QT_SVG_VERSION = $$QT_VERSION ++QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION ++QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION ++QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION ++ ++QT.svg.name = QtSvg +QT.svg.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSvg - QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private - QT.svg.sources = $$QT_MODULE_BASE/src/svg - QT.svg.libs = $$QT_MODULE_LIB_BASE ++QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private ++QT.svg.sources = $$QT_MODULE_BASE/src/svg ++QT.svg.libs = $$QT_MODULE_LIB_BASE ++QT.svg.depends = core gui diff --git a/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro index 5c5a31e..642fb0f 100644 --- a/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro @@ -227,5 +247,5 @@ index 0000000..275e96c + "QtSvg" => "$basedir/modules/qt_svg.pri", +); -- -1.7.3.2.343.g7d43d +1.7.3.4 |