From 817232ee944530106ce52b54197e80306e301b7e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 27 Dec 2010 14:49:29 +0100 Subject: Move QtSvg into a separate repository --- src/modules/qt_svg.pri | 11 ----------- src/plugins/imageformats/imageformats.pro | 1 - src/plugins/plugins.pro | 2 +- src/src.pro | 9 +-------- 4 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 src/modules/qt_svg.pri (limited to 'src') diff --git a/src/modules/qt_svg.pri b/src/modules/qt_svg.pri deleted file mode 100644 index 90df93f130..0000000000 --- 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 5fff2deb7d..66dea099aa 100644 --- 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 d0d7188e06..c1aff35428 100644 --- 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 5c33e92dcd..7c51c25609 100644 --- 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 - } } -- cgit v1.2.3