Move QtSvg into a separate repository

diff --git a/src/modules/qt_svg.pri b/src/modules/qt_svg.pri
deleted file mode 100644 (file)
index 90df93f..0000000
--- a/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/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
index 5fff2de..66dea09 100644 (file)
--- a/src/plugins/imageformats/imageformats.pro
+++ b/src/plugins/imageformats/imageformats.pro
@@ -3,6 +3,5 @@ TEMPLATE = subdirs
 !contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg
 !contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif
 !contains(QT_CONFIG, no-mng):!contains(QT_CONFIG, mng):SUBDIRS += mng
-contains(QT_CONFIG, svg):SUBDIRS += svg
 !contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff
 !contains(QT_CONFIG, no-ico):SUBDIRS += ico

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index d0d7188..c1aff35 100644 (file)
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -6,7 +6,7 @@ unix:!symbian {
 } else {
         SUBDIRS *= codecs
 }
-!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines
+!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats
 !embedded:!qpa:SUBDIRS *= graphicssystems
 embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
 !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods

diff --git a/src/src.pro b/src/src.pro
index 5c33e92..7c51c25 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -13,7 +13,6 @@ nacl: SRC_SUBDIRS -= src_network src_testlib
 
 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl
 contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg
-contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg
 SRC_SUBDIRS += src_plugins
 
 # s60installs need to be at the end, because qtbase.pro does an ordered build,
@@ -38,8 +37,6 @@ src_sql.subdir = $$QT_SOURCE_TREE/src/sql
 src_sql.target = sub-sql
 src_network.subdir = $$QT_SOURCE_TREE/src/network
 src_network.target = sub-network
-src_svg.subdir = $$QT_SOURCE_TREE/src/svg
-src_svg.target = sub-svg
 src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl
 src_opengl.target = sub-opengl
 src_openvg.subdir = $$QT_SOURCE_TREE/src/openvg
@@ -56,7 +53,6 @@ src_testlib.target = sub-testlib
    embedded: src_gui.depends += src_network
    src_xml.depends = src_corelib
    src_dbus.depends = src_corelib src_xml
-   src_svg.depends = src_corelib src_gui
    src_network.depends = src_corelib
    src_opengl.depends = src_gui
    src_openvg.depends = src_gui
@@ -64,7 +60,7 @@ src_testlib.target = sub-testlib
    src_testlib.depends = src_corelib
    src_tools_idc.depends = src_corelib             # target defined in tools.pro
    src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro
-   src_plugins.depends = src_gui src_sql src_svg src_xml
+   src_plugins.depends = src_gui src_sql src_xml
    src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
    src_s60installs.depends -= src_s60installs
    contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
@@ -72,9 +68,6 @@ src_testlib.target = sub-testlib
       src_declarative.depends += src_opengl
       src_webkit.depends += src_opengl
    }
-   contains(QT_CONFIG, svg) {
-      src_declarative.depends += src_svg
-   }
 }
 
 

diff --git a/sync.profile b/sync.profile
index c8ef4fc..7984329 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -6,7 +6,6 @@
     "QtXml" => "$basedir/src/xml",
     "QtSql" => "$basedir/src/sql",
     "QtNetwork" => "$basedir/src/network",
-    "QtSvg" => "$basedir/src/svg",
     "QtTest" => "$basedir/src/testlib",
     "QtDBus" => "$basedir/src/dbus",
 );
@@ -32,7 +31,6 @@
     "core" => "#include <QtCore/QtCore>\n",
     "gui" => "#include <QtGui/QtGui>\n",
     "network" => "#include <QtNetwork/QtNetwork>\n",
-    "svg" => "#include <QtSvg/QtSvg>\n",
     "opengl" => "#include <QtOpenGL/QtOpenGL>\n",
     "openvg" => "#include <QtOpenVG/QtOpenVG>\n",
     "xml" => "#include <QtXml/QtXml>\n",
@@ -45,7 +43,6 @@
     "QtOpenGL" => "$basedir/src/modules/qt_opengl.pri",
     "QtOpenVG" => "$basedir/src/modules/qt_openvg.pri",
     "QtSql" => "$basedir/src/modules/qt_sql.pri",
-    "QtSvg" => "$basedir/src/modules/qt_svg.pri",
     "QtTest" => "$basedir/src/modules/qt_testlib.pri",
     "QtXml" => "$basedir/src/modules/qt_xml.pri",
 );