1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Regenenerate projects where recent changes happened

Browse Source 
Change-Id: If86e49d73a45b7cfc494fa48bdc6cb1ba503b112
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-02-08 11:17:24 +01:00
parent f1ae5ae726
commit c9e67a7926
22 changed files with 135 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/corelib/configure.cmake
View File

@ -149,6 +149,24 @@ std::mt19937 mt(0);
}
")
# cxx17_filesystem
qt_config_compile_test(cxx17_filesystem
LABEL "C++17 <filesystem>"
CODE
"
#include <filesystem>
int main(int argc, char **argv)
{
(void)argc; (void)argv;
/* BEGIN TEST: */
std::filesystem::path p(\"./file\");
/* END TEST: */
return 0;
}
"# FIXME: qmake: CONFIG += c++17
)
# eventfd
qt_config_compile_test(eventfd
LABEL "eventfd"
@ -515,6 +533,10 @@ qt_feature("cxx11_future" PUBLIC
LABEL "C++11 <future>"
CONDITION TEST_cxx11_future
)
qt_feature("cxx17_filesystem" PUBLIC
LABEL "C++17 <filesystem>"
CONDITION TEST_cxx17_filesystem
)
qt_feature("eventfd" PUBLIC
LABEL "eventfd"
CONDITION NOT WASM AND TEST_eventfd

1
src/gui/.prev_CMakeLists.txt
View File

@ -262,7 +262,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h
opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h
opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h

1
src/gui/CMakeLists.txt
View File

@ -344,7 +344,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h
opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h
opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h

5
src/gui/configure.cmake
View File

@ -557,6 +557,11 @@ qt_feature("directwrite1" PRIVATE
CONDITION libs.dwrite_1 OR FIXME
EMIT_IF WIN32
)
qt_feature("directwrite3" PRIVATE
LABEL "DirectWrite 3"
CONDITION QT_FEATURE_directwrite1 AND libs.dwrite_3 OR FIXME
EMIT_IF WIN32
)
qt_feature("directwrite2" PRIVATE
LABEL "DirectWrite 2"
CONDITION QT_FEATURE_directwrite1 AND libs.dwrite_2 OR FIXME

1
src/opengl/CMakeLists.txt
View File

@ -17,6 +17,7 @@ qt_add_module(OpenGL
qopenglpixeltransferoptions.cpp qopenglpixeltransferoptions.h
qopenglshadercache_p.h
qopengltexture.cpp qopengltexture.h qopengltexture_p.h
qopengltextureblitter.cpp qopengltextureblitter.h
qopengltexturecache.cpp qopengltexturecache_p.h
qopengltextureglyphcache.cpp qopengltextureglyphcache_p.h
qopengltexturehelper.cpp qopengltexturehelper_p.h

15
src/platformsupport/fontdatabases/.prev_CMakeLists.txt
View File

@ -67,6 +67,7 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
SOURCES
windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h
windows/qwindowsfontdatabasebase.cpp windows/qwindowsfontdatabasebase_p.h
windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
LIBRARIES
@ -90,14 +91,24 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATUR
d2d1
)
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 AND NOT WINRT
SOURCES
windows/qwindowsdirectwritefontdatabase.cpp windows/qwindowsdirectwritefontdatabase_p.h
DEFINES
QT_USE_DIRECTWRITE2
QT_USE_DIRECTWRITE3
LIBRARIES
dwrite_3
)
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
DEFINES
QT_USE_DIRECTWRITE2
LIBRARIES
dwrite_2
)
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
LIBRARIES
dwrite
)

15
src/platformsupport/fontdatabases/CMakeLists.txt
View File

@ -70,6 +70,7 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
SOURCES
windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h
windows/qwindowsfontdatabasebase.cpp windows/qwindowsfontdatabasebase_p.h
windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
LIBRARIES
@ -93,14 +94,24 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATUR
d2d1
)
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 AND NOT WINRT
SOURCES
windows/qwindowsdirectwritefontdatabase.cpp windows/qwindowsdirectwritefontdatabase_p.h
DEFINES
QT_USE_DIRECTWRITE2
QT_USE_DIRECTWRITE3
LIBRARIES
dwrite_3
)
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
DEFINES
QT_USE_DIRECTWRITE2
LIBRARIES
dwrite_2
)
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT
qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
LIBRARIES
dwrite
)

2
src/platformsupport/platformcompositor/CMakeLists.txt
View File

@ -10,11 +10,13 @@ qt_add_module(PlatformCompositorSupport
SOURCES
qopenglcompositor.cpp qopenglcompositor_p.h
qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h
DEFINES
QT_NO_CAST_FROM_ASCII
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::OpenGL
)
#### Keys ignored in scope 1:.:.:platformcompositor.pro:<TRUE>:

5
src/plugins/platforms/android/.prev_CMakeLists.txt
View File

@ -69,6 +69,11 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
Qt::VulkanSupportPrivate
)
qt_extend_target(QAndroidIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
SOURCES
extract.cpp

5
src/plugins/platforms/android/CMakeLists.txt
View File

@ -78,6 +78,11 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
Qt::VulkanSupportPrivate
)
qt_extend_target(QAndroidIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
SOURCES
extract.cpp

9
src/plugins/platforms/cocoa/.prev_CMakeLists.txt
View File

@ -107,6 +107,11 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
qcocoasessionmanager.cpp qcocoasessionmanager.h
)
qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
SOURCES
qpaintengine_mac.mm qpaintengine_mac_p.h
@ -114,7 +119,7 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
Qt::WidgetsPrivate
)
#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
#### Keys ignored in scope 8:.:.:cocoa.pro:TARGET Qt::Widgets:
# QT_FOR_CONFIG = "widgets"
qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
@ -141,5 +146,5 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TAR
qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
)
#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 13:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"

9
src/plugins/platforms/cocoa/CMakeLists.txt
View File

@ -111,6 +111,11 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
qcocoasessionmanager.cpp qcocoasessionmanager.h
)
qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
SOURCES
qpaintengine_mac.mm qpaintengine_mac_p.h
@ -118,7 +123,7 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
Qt::WidgetsPrivate
)
#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
#### Keys ignored in scope 8:.:.:cocoa.pro:TARGET Qt::Widgets:
# QT_FOR_CONFIG = "widgets"
qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
@ -145,5 +150,5 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TAR
qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
)
#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 13:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"

44
src/plugins/platforms/ios/.prev_CMakeLists.txt
View File

@ -1,12 +1,12 @@
# Generated from ios.pro.
#####################################################################
## qios Plugin:
## QIOSIntegrationPlugin Plugin:
#####################################################################
add_qt_plugin(qios
add_qt_plugin(QIOSIntegrationPlugin
OUTPUT_NAME qios
TYPE platforms
CLASS_NAME QIOSIntegrationPlugin
SOURCES
plugin.mm
qiosapplicationdelegate.h qiosapplicationdelegate.mm
@ -26,37 +26,30 @@ add_qt_plugin(qios
qioswindow.h qioswindow.mm
quiaccessibilityelement.h quiaccessibilityelement.mm
quiview.h quiview.mm
LIBRARIES
Qt::ClipboardSupportPrivate
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
Qt::GraphicsSupportPrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES
${FWAudioToolbox}
${FWFoundation}
${FWQuartzCore}
${FWUIKit}
Qt::ClipboardSupport
Qt::Core
Qt::FontDatabaseSupport
Qt::GraphicsSupport
Qt::Gui
Qt::ClipboardSupportPrivate
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
Qt::GraphicsSupportPrivate
Qt::GuiPrivate
)
#### Keys ignored in scope 2:.:.:kernel.pro:<TRUE>:
# OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm"
# PLUGIN_CLASS_NAME = "QIOSIntegrationPlugin"
# PLUGIN_TYPE = "platforms"
# _LOADED = "qt_plugin"
## Scopes:
#####################################################################
#### Keys ignored in scope 3:.:.:kernel.pro:QT_FEATURE_shared:
# CONFIG = "static"
extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
extend_target(qios CONDITION NOT APPLE_TVOS
extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS
SOURCES
qiosclipboard.h qiosclipboard.mm
qiosfiledialog.h qiosfiledialog.mm
@ -67,15 +60,6 @@ extend_target(qios CONDITION NOT APPLE_TVOS
${FWAssetsLibrary}
)
#### Keys ignored in scope 5:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 6:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
add_subdirectory(optional)
if(QT_FEATURE_shared)
endif()
if(NOT APPLE_TVOS)
endif()
if(NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN)
endif()

7
src/plugins/platforms/ios/CMakeLists.txt
View File

@ -44,6 +44,11 @@ add_qt_plugin(QIOSIntegrationPlugin
## Scopes:
#####################################################################
extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS
SOURCES
qiosclipboard.h qiosclipboard.mm
@ -55,6 +60,6 @@ extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS
${FWAssetsLibrary}
)
#### Keys ignored in scope 5:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 6:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
add_subdirectory(optional)

7
src/plugins/platforms/windows/.prev_CMakeLists.txt
View File

@ -86,6 +86,11 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
## Scopes:
#####################################################################
qt_extend_target(QWindowsIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
SOURCES
uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
@ -117,7 +122,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
Qt::VulkanSupportPrivate
)
#### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 5:.:.: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 AND NOT QT_FEATURE_opengles2

7
src/plugins/platforms/windows/CMakeLists.txt
View File

@ -87,6 +87,11 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
## Scopes:
#####################################################################
qt_extend_target(QWindowsIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
SOURCES
uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
@ -118,7 +123,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
Qt::VulkanSupportPrivate
)
#### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 5:.:.: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 AND NOT QT_FEATURE_opengles2

9
src/plugins/platforms/xcb/.prev_CMakeLists.txt
View File

@ -66,6 +66,11 @@ qt_add_module(XcbQpa
## Scopes:
#####################################################################
qt_extend_target(XcbQpa CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
PUBLIC_LIBRARIES
Qt::LinuxAccessibilitySupportPrivate
@ -150,12 +155,12 @@ qt_add_plugin(QXcbIntegrationPlugin
Qt::XcbQpaPrivate
)
#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>:
#### Keys ignored in scope 20:.:.:xcb-plugin.pro:<TRUE>:
# OTHER_FILES = "xcb.json" "README"
## Scopes:
#####################################################################
#### Keys ignored in scope 21:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 22:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
add_subdirectory(gl_integrations)

9
src/plugins/platforms/xcb/CMakeLists.txt
View File

@ -89,6 +89,11 @@ qt_add_module(XcbQpa
## Scopes:
#####################################################################
qt_extend_target(XcbQpa CONDITION TARGET Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
PUBLIC_LIBRARIES
Qt::LinuxAccessibilitySupportPrivate
@ -190,13 +195,13 @@ qt_add_plugin(QXcbIntegrationPlugin
Qt::XcbQpaPrivate
)
#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>:
#### Keys ignored in scope 20:.:.:xcb-plugin.pro:<TRUE>:
# OTHER_FILES = "xcb.json" "README"
## Scopes:
#####################################################################
#### Keys ignored in scope 21:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 22:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
add_subdirectory(gl_integrations)
if(OFF)

8
src/plugins/sqldrivers/configure.cmake
View File

@ -44,15 +44,7 @@ qt_feature("sql-psql" PRIVATE
LABEL "PostgreSQL"
CONDITION PostgreSQL_FOUND
)
qt_feature("sql-sqlite2" PRIVATE
LABEL "SQLite2"
CONDITION libs.sqlite2 OR FIXME
)
qt_feature("sql-sqlite" PRIVATE
LABEL "SQLite"
CONDITION QT_FEATURE_datestring AND SQLite3_FOUND
)
qt_feature("sql-tds" PRIVATE
LABEL "TDS (Sybase)"
CONDITION QT_FEATURE_datestring AND libs.tds OR FIXME
)

5
tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt
View File

@ -14,3 +14,8 @@ add_qt_benchmark(tst_bench_qdiriterator
## Scopes:
#####################################################################
extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9))
LINK_OPTIONS
"-lstdc++fs"
)

6
tests/manual/CMakeLists.txt
View File

@ -16,7 +16,7 @@ add_subdirectory(filetest)
# add_subdirectory(foreignwindows)
# special case end
add_subdirectory(gestures)
add_subdirectory(highdpi)
# add_subdirectory(highdpi) special case broken in dev
add_subdirectory(inputmethodhints)
add_subdirectory(keypadnavigation)
#add_subdirectory(lance) # special case qgl.h missing
@ -76,10 +76,10 @@ if(QT_FEATURE_openssl)
add_subdirectory(qssloptions)
endif()
if(QT_FEATURE_opengl)
add_subdirectory(qopengltextureblitter)
# add_subdirectory(qopengltextureblitter) special case broken in dev
endif()
if(QT_FEATURE_egl AND QT_FEATURE_opengl)
add_subdirectory(qopenglcontext)
# add_subdirectory(qopenglcontext) # special case broken in dev
endif()
if(QT_FEATURE_vulkan)
add_subdirectory(qvulkaninstance)

2
tests/manual/widgets/kernel/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# Generated from kernel.pro.
add_subdirectory(qtooltip)
# add_subdirectory(qtooltip) # special case broken in dev
add_subdirectory(sizeonhide)
add_subdirectory(layoutreplace)