From df32c9a1127cfec15aab834cc2df363fa49ca5bd Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 2 Jun 2017 15:12:02 +0200 Subject: 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 --- src/plugins/platforms/windows/windows.pri | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/plugins/platforms/windows/windows.pri') diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri index 73677311f5..6d01d05fcc 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/src/plugins/platforms/windows/windows.pri @@ -69,33 +69,28 @@ qtConfig(dynamicgl) { HEADERS += $$PWD/qwindowseglcontext.h } -!contains( DEFINES, QT_NO_CLIPBOARD ) { +qtConfig(clipboard) { SOURCES += $$PWD/qwindowsclipboard.cpp HEADERS += $$PWD/qwindowsclipboard.h -} - -# drag and drop on windows only works if a clipboard is available -!contains( DEFINES, QT_NO_DRAGANDDROP ) { - !win32:SOURCES += $$PWD/qwindowsdrag.cpp - !win32:HEADERS += $$PWD/qwindowsdrag.h - win32:!contains( DEFINES, QT_NO_CLIPBOARD ) { + # drag and drop on windows only works if a clipboard is available + qtConfig(draganddrop) { HEADERS += $$PWD/qwindowsdrag.h SOURCES += $$PWD/qwindowsdrag.cpp } } -!contains( DEFINES, QT_NO_TABLETEVENT ) { +qtConfig(tabletevent) { INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/wintab HEADERS += $$PWD/qwindowstabletsupport.h SOURCES += $$PWD/qwindowstabletsupport.cpp } -!contains( DEFINES, QT_NO_SESSIONMANAGER ) { +qtConfig(sessionmanager) { SOURCES += $$PWD/qwindowssessionmanager.cpp HEADERS += $$PWD/qwindowssessionmanager.h } -!contains( DEFINES, QT_NO_IMAGEFORMAT_PNG ):RESOURCES += $$PWD/cursors.qrc +qtConfig(imageformat_png):RESOURCES += $$PWD/cursors.qrc RESOURCES += $$PWD/openglblacklists.qrc -- cgit v1.2.3