diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-02 15:12:02 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-08 07:39:00 +0000 |
commit | df32c9a1127cfec15aab834cc2df363fa49ca5bd (patch) | |
tree | ade2b838ad37198f73c82c1c8bbf5ab5b305a995 /src/plugins/platforms/windows/qwindowsintegration.h | |
parent | e1a073044855c43ca11e9ada6eedded199c02fc8 (diff) |
Windows QPA: Port to new feature system
Replace all checks for DEFINES in windows.pri by proper
configure system checks as they no longer seem to work.
Task-number: QTBUG-61192
Change-Id: I625c9de0812fd376d06eacb065d3a32a499b6b00
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index 607203829f..28d4fd3026 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -81,9 +81,9 @@ public: #endif QAbstractEventDispatcher *createEventDispatcher() const override; void initialize() override; -#ifndef QT_NO_CLIPBOARD +#if QT_CONFIG(clipboard) QPlatformClipboard *clipboard() const override; -# ifndef QT_NO_DRAGANDDROP +# if QT_CONFIG(draganddrop) QPlatformDrag *drag() const override; # endif #endif // !QT_NO_CLIPBOARD @@ -109,7 +109,7 @@ public: void beep() const override; -#if !defined(QT_NO_SESSIONMANAGER) +#if QT_CONFIG(sessionmanager) QPlatformSessionManager *createPlatformSessionManager(const QString &id, const QString &key) const override; #endif |