AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildsystem: Remove SXE from the configure and qconfig-*.h files

Browse Source 
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>
This commit is contained in:
Holger Hans Peter Freyther 2012-06-29 18:59:29 +02:00 committed by Qt by Nokia
parent 978937ab4a
commit 56df16fe4b
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -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

3
src/corelib/global/qconfig-minimal.h
View File

@ -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

3
src/corelib/global/qconfig-nacl.h
View File

@ -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

4
tools/configure/configureapp.cpp
View File

@ -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();