diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/.prev_CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/platforms/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/platforms/direct2d/direct2d.pro | 2 | ||||
-rw-r--r-- | src/plugins/platforms/platforms.pro | 2 | ||||
-rw-r--r-- | src/plugins/platforms/windows/.prev_CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/plugins/platforms/windows/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/plugins/platforms/windows/windows.pro | 2 |
7 files changed, 6 insertions, 20 deletions
diff --git a/src/plugins/platforms/.prev_CMakeLists.txt b/src/plugins/platforms/.prev_CMakeLists.txt index baded9525c..7cbd96f323 100644 --- a/src/plugins/platforms/.prev_CMakeLists.txt +++ b/src/plugins/platforms/.prev_CMakeLists.txt @@ -21,7 +21,7 @@ endif() if(WIN32) add_subdirectory(windows) endif() -if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_directwrite1) +if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_directwrite) add_subdirectory(direct2d) endif() if(QNX) diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt index a509cdfdc4..47b8099332 100644 --- a/src/plugins/platforms/CMakeLists.txt +++ b/src/plugins/platforms/CMakeLists.txt @@ -21,7 +21,7 @@ endif() if(WIN32) add_subdirectory(windows) endif() -if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_directwrite1) +if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_directwrite) # add_subdirectory(direct2d) # special case TODO endif() if(QNX) diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro index 1f8b41e7ec..70e4ef497e 100644 --- a/src/plugins/platforms/direct2d/direct2d.pro +++ b/src/plugins/platforms/direct2d/direct2d.pro @@ -4,7 +4,7 @@ QT += \ core-private gui-private LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid -QMAKE_USE_PRIVATE += gdi32 dwrite_1 d2d1_1 +QMAKE_USE_PRIVATE += gdi32 dwrite_2 d2d1_1 include(../windows/windows.pri) diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index ab7ee395d7..2ce9790d91 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -16,7 +16,7 @@ osx: SUBDIRS += cocoa win32: SUBDIRS += windows -qtConfig(direct2d1_1):qtConfig(directwrite1) { +qtConfig(direct2d1_1):qtConfig(directwrite) { SUBDIRS += direct2d } diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index 84219ddcd8..7252a1d065 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -90,13 +90,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl Qt::OpenGLPrivate ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3 - DEFINES - QT_USE_DIRECTWRITE2 - QT_USE_DIRECTWRITE3 -) - -#### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 3:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 9674710d54..9064b2f740 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -91,13 +91,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl Qt::OpenGLPrivate ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3 - DEFINES - QT_USE_DIRECTWRITE2 - QT_USE_DIRECTWRITE3 -) - -#### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 3:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 39a07e6361..577bbd775b 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -5,8 +5,6 @@ QT += \ qtConfig(opengl): QT += opengl-private -qtConfig(directwrite3): DEFINES *= QT_USE_DIRECTWRITE2 QT_USE_DIRECTWRITE3 - LIBS += -ldwmapi QMAKE_USE_PRIVATE += gdi32 |