diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-18 22:25:08 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:27:29 +0000 |
| commit | 56ee007b3f44eb3276b244a630f55482c2b02228 (patch) | |
| tree | 349a978e664592f51d26563603219e5a537d3cfc /src/plugins/platforms/linuxfb | |
| parent | 606924132ff1f11b9d7b4357251f07ccabb8bdb6 (diff) | |
| download | qtbase-56ee007b3f44eb3276b244a630f55482c2b02228.tar.gz | |
Rework privateFeature
privateFeature would add QT_NO_FEATURE to the DEFINES in the private
.pri file, which was somewhat inelegant.
Additionally, it would add the feature to the _public_ QT_CONFIG
variable, which was plain wrong.
Replace the implementation with the one just introduced for
publicFeature, with the difference that the features are written to the
private files instead.
As this entirely disposes of the old system, all usages in the project
files need to be replaced atomically as well.
Change-Id: I506b5d41054410659ea503bc6901736cd5edec6e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/linuxfb')
| -rw-r--r-- | src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp index 685f231756..707301487d 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp @@ -52,17 +52,17 @@ #include <QtGui/private/qguiapplication_p.h> #include <qpa/qplatforminputcontextfactory_p.h> -#ifndef QT_NO_LIBINPUT +#if QT_CONFIG(libinput) #include <QtPlatformSupport/private/qlibinputhandler_p.h> #endif -#if !defined(QT_NO_EVDEV) && !defined(Q_OS_ANDROID) +#if QT_CONFIG(evdev) && !defined(Q_OS_ANDROID) #include <QtPlatformSupport/private/qevdevmousemanager_p.h> #include <QtPlatformSupport/private/qevdevkeyboardmanager_p.h> #include <QtPlatformSupport/private/qevdevtouchmanager_p.h> #endif -#if !defined(QT_NO_TSLIB) && !defined(Q_OS_ANDROID) +#if QT_CONFIG(tslib) && !defined(Q_OS_ANDROID) #include <QtPlatformSupport/private/qtslib_p.h> #endif @@ -140,22 +140,22 @@ QPlatformServices *QLinuxFbIntegration::services() const void QLinuxFbIntegration::createInputHandlers() { -#ifndef QT_NO_LIBINPUT +#if QT_CONFIG(libinput) if (!qEnvironmentVariableIntValue("QT_QPA_FB_NO_LIBINPUT")) { new QLibInputHandler(QLatin1String("libinput"), QString()); return; } #endif -#if !defined(QT_NO_EVDEV) && !defined(Q_OS_ANDROID) +#if QT_CONFIG(evdev) && !defined(Q_OS_ANDROID) new QEvdevKeyboardManager(QLatin1String("EvdevKeyboard"), QString(), this); new QEvdevMouseManager(QLatin1String("EvdevMouse"), QString(), this); -#ifndef QT_NO_TSLIB +#if QT_CONFIG(tslib) const bool useTslib = qEnvironmentVariableIntValue("QT_QPA_FB_TSLIB"); if (useTslib) new QTsLibMouseHandler(QLatin1String("TsLib"), QString()); else -#endif // QT_NO_TSLIB +#endif new QEvdevTouchManager(QLatin1String("EvdevTouch"), QString() /* spec */, this); #endif } |