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

Remove some dead QWS code from configure.

Browse Source 
Change-Id: Ic1b47533e3f04cebaac83ca632068c2e791a846c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Stephen Kelly 2012-07-26 09:48:15 +02:00 committed by Qt by Nokia
parent 1e9d9e2044
commit 187ea846a6
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -5711,7 +5711,7 @@ if [ "$CFG_DEV" = "yes" ]; then
fi fi
# Add QPA to config.h # Add QPA to config.h
QCONFIG_FLAGS="$QCONFIG_FLAGS Q_WS_QPA QT_NO_QWS_QPF QT_NO_QWS_QPF2" QCONFIG_FLAGS="$QCONFIG_FLAGS Q_WS_QPA"
if [ "${CFG_USE_FLOATMATH}" = "yes" ]; then if [ "${CFG_USE_FLOATMATH}" = "yes" ]; then
QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_USE_MATH_H_FLOATS" QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_USE_MATH_H_FLOATS"

35
tools/configure/configureapp.cpp
View File

@ -1520,7 +1520,6 @@ void Configure::applySpecSpecifics()
dictionary[ "MOUSE_DRIVERS" ] = "pc linuxtp"; dictionary[ "MOUSE_DRIVERS" ] = "pc linuxtp";
dictionary[ "OPENGL" ] = "no"; dictionary[ "OPENGL" ] = "no";
dictionary[ "DBUS"] = "no"; dictionary[ "DBUS"] = "no";
dictionary[ "QT_QWS_DEPTH" ] = "4 8 16 24 32";
dictionary[ "QT_INOTIFY" ] = "no"; dictionary[ "QT_INOTIFY" ] = "no";
dictionary[ "QT_CUPS" ] = "no"; dictionary[ "QT_CUPS" ] = "no";
dictionary[ "QT_GLIB" ] = "no"; dictionary[ "QT_GLIB" ] = "no";
@ -3186,40 +3185,6 @@ void Configure::generateConfigfiles()
for (int i = 0; i < qconfigList.count(); ++i) for (int i = 0; i < qconfigList.count(); ++i)
tmpStream << addDefine(qconfigList.at(i)); tmpStream << addDefine(qconfigList.at(i));
if (dictionary["EMBEDDED"] == "yes")
{
// Check for keyboard, mouse, gfx.
QStringList kbdDrivers = dictionary["KBD_DRIVERS"].split(" ");;
QStringList allKbdDrivers;
allKbdDrivers<<"tty"<<"usb"<<"sl5000"<<"yopy"<<"vr41xx"<<"qvfb"<<"um";
foreach (const QString &kbd, allKbdDrivers) {
if (!kbdDrivers.contains(kbd))
tmpStream<<"#define QT_NO_QWS_KBD_"<<kbd.toUpper()<<endl;
}
QStringList mouseDrivers = dictionary["MOUSE_DRIVERS"].split(" ");
QStringList allMouseDrivers;
allMouseDrivers << "pc"<<"bus"<<"linuxtp"<<"yopy"<<"vr41xx"<<"tslib"<<"qvfb";
foreach (const QString &mouse, allMouseDrivers) {
if (!mouseDrivers.contains(mouse))
tmpStream<<"#define QT_NO_QWS_MOUSE_"<<mouse.toUpper()<<endl;
}
QStringList gfxDrivers = dictionary["GFX_DRIVERS"].split(" ");
QStringList allGfxDrivers;
allGfxDrivers<<"linuxfb"<<"transformed"<<"qvfb"<<"multiscreen"<<"ahi";
foreach (const QString &gfx, allGfxDrivers) {
if (!gfxDrivers.contains(gfx))
tmpStream<<"#define QT_NO_QWS_"<<gfx.toUpper()<<endl;
}
tmpStream<<"#define Q_WS_QWS"<<endl;
QStringList depths = dictionary[ "QT_QWS_DEPTH" ].split(" ");
foreach (const QString &depth, depths)
tmpStream<<"#define QT_QWS_DEPTH_"+depth<<endl;
}
if (dictionary[ "QT_CUPS" ] == "no") if (dictionary[ "QT_CUPS" ] == "no")
tmpStream<<"#define QT_NO_CUPS"<<endl; tmpStream<<"#define QT_NO_CUPS"<<endl;