summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-10-25 21:28:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-29 15:37:39 +0100
commit6f0c88f6c36030c91b1d54e00989cc9f39529951 (patch)
tree654cd4e3eff9329ef1c58aea5ad7a6aabe784122
parent95156cfff75398d8e920f2aee5abef42dd07c0b3 (diff)
purge references to non-features
due to modularization, svg and activeqt do not belong here any more. note that concurrent and dbus are staying for the time being, because being part of qtbase and configure lacking support to switch them off, this is the only way to disable the modules. Change-Id: Idbc0d2f7db23f7e797fc301ab1136f69f9049b27 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/corelib/global/qconfig-medium.h5
-rw-r--r--src/corelib/global/qconfig-minimal.h19
-rw-r--r--src/corelib/global/qconfig-nacl.h19
3 files changed, 0 insertions, 43 deletions
diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h
index 5ad2610f68..e5ab33faed 100644
--- a/src/corelib/global/qconfig-medium.h
+++ b/src/corelib/global/qconfig-medium.h
@@ -241,8 +241,3 @@
#ifndef QT_NO_TREEWIDGET
# define QT_NO_TREEWIDGET
#endif
-
-/* Windows */
-#ifndef QT_NO_WIN_ACTIVEQT
-# define QT_NO_WIN_ACTIVEQT
-#endif
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index 5ef8366903..b27f3271c1 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -275,20 +275,6 @@
# define QT_NO_CUPS
#endif
-/* SVG */
-#ifndef QT_NO_SVG
-# define QT_NO_SVG
-#endif
-#ifndef QT_NO_SVGGENERATOR
-# define QT_NO_SVGGENERATOR
-#endif
-#ifndef QT_NO_SVGRENDERER
-# define QT_NO_SVGRENDERER
-#endif
-#ifndef QT_NO_SVGWIDGET
-# define QT_NO_SVGWIDGET
-#endif
-
/* Styles */
#ifndef QT_NO_STYLE_FUSION
# define QT_NO_STYLE_FUSION
@@ -474,8 +460,3 @@
#ifndef QT_NO_VALIDATOR
# define QT_NO_VALIDATOR
#endif
-
-/* Windows */
-#ifndef QT_NO_WIN_ACTIVEQT
-# define QT_NO_WIN_ACTIVEQT
-#endif
diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
index 4773c5ec26..22dd56e772 100644
--- a/src/corelib/global/qconfig-nacl.h
+++ b/src/corelib/global/qconfig-nacl.h
@@ -203,20 +203,6 @@
# define QT_NO_CUPS
#endif
-/* SVG */
-#ifndef QT_NO_SVG
-# define QT_NO_SVG
-#endif
-#ifndef QT_NO_SVGGENERATOR
-# define QT_NO_SVGGENERATOR
-#endif
-#ifndef QT_NO_SVGRENDERER
-# define QT_NO_SVGRENDERER
-#endif
-#ifndef QT_NO_SVGWIDGET
-# define QT_NO_SVGWIDGET
-#endif
-
/* Styles */
#ifndef QT_NO_STYLE_STYLESHEET
# define QT_NO_STYLE_STYLESHEET
@@ -247,8 +233,3 @@
#ifndef QT_NO_SYSTEMTRAYICON
# define QT_NO_SYSTEMTRAYICON
#endif
-
-/* Windows */
-#ifndef QT_NO_WIN_ACTIVEQT
-# define QT_NO_WIN_ACTIVEQT
-#endif