diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2012-06-29 18:59:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-02 10:10:56 +0200 |
| commit | 56df16fe4b9d188b712956e3bf1d579246a04fc9 (patch) | |
| tree | 9452b42ca8c0c10498d27655fb760816d2af932e | |
| parent | 978937ab4a44179224a3021f89555bfa988fe687 (diff) | |
buildsystem: Remove SXE from the configure and qconfig-*.h files
The SXE feature was used with Qtopia but is long gone. Clean it up.
Change-Id: I55fba97b6382300ba63e94f3a6c415227f571e37
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-minimal.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-nacl.h | 3 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
4 files changed, 0 insertions, 20 deletions
@@ -772,7 +772,6 @@ CFG_RPATH=yes CFG_FRAMEWORK=auto MAC_CONFIG_TEST_COMMANDLINE= # used to make the configure tests run with the correct arch's and SDK settings CFG_MAC_HARFBUZZ=no -CFG_SXE=no CFG_PREFIX_INSTALL=yes CFG_SDK= DEFINES= @@ -1160,9 +1159,6 @@ while [ "$#" -gt 0 ]; do bindir) QT_INSTALL_BINS="$VAL" ;; - sxe) - CFG_SXE="$VAL" - ;; sse) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_SSE="$VAL" @@ -5088,11 +5084,6 @@ if [ "$CFG_OPENGL" = "es2" ]; then QT_CONFIG="$QT_CONFIG opengles2" fi -# safe execution environment -if [ "$CFG_SXE" != "no" ]; then - QT_CONFIG="$QT_CONFIG sxe" -fi - # build up the variables for output if [ "$CFG_DEBUG" = "yes" ]; then QMAKE_OUTDIR="${QMAKE_OUTDIR}debug" @@ -5624,7 +5615,6 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_PNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG" [ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG" [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" -[ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" [ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" # X11/Unix/Mac only configs diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index 57aa26b381..bc1758ae85 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -348,9 +348,6 @@ #ifndef QT_NO_QWS_SOUNDSERVER # define QT_NO_QWS_SOUNDSERVER #endif -#ifndef QT_NO_SXE -# define QT_NO_SXE -#endif #ifndef QT_NO_QWS_PROPERTIES # define QT_NO_QWS_PROPERTIES #endif diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h index 7e48afaee3..d0078f2732 100644 --- a/src/corelib/global/qconfig-nacl.h +++ b/src/corelib/global/qconfig-nacl.h @@ -274,9 +274,6 @@ #ifndef QT_NO_QWS_SOUNDSERVER # define QT_NO_QWS_SOUNDSERVER #endif -#ifndef QT_NO_SXE -# define QT_NO_SXE -#endif #ifndef QT_NO_QWS_PROPERTIES # define QT_NO_QWS_PROPERTIES #endif diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index fb666e221e..38171f5eb4 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1514,7 +1514,6 @@ void Configure::applySpecSpecifics() dictionary[ "OPENGL" ] = "no"; dictionary[ "DBUS"] = "no"; dictionary[ "QT_QWS_DEPTH" ] = "4 8 16 24 32"; - dictionary[ "QT_SXE" ] = "no"; dictionary[ "QT_INOTIFY" ] = "no"; dictionary[ "QT_CUPS" ] = "no"; dictionary[ "QT_GLIB" ] = "no"; @@ -3211,9 +3210,6 @@ void Configure::generateConfigfiles() if (dictionary[ "QT_INOTIFY" ] == "no") tmpStream<<"#define QT_NO_INOTIFY"<<endl; - if (dictionary[ "QT_SXE" ] == "no") - tmpStream<<"#define QT_NO_SXE"<<endl; - tmpStream<<"#define QT_QPA_DEFAULT_PLATFORM_NAME \"" << qpaPlatformName() << "\""<<endl; tmpStream.flush(); |