diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/configure.cmake | 2 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/CMakeLists.txt | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index b2f65696f3..08d1e0d976 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -120,7 +120,7 @@ int pipes[2]; # special case begin # cxx11_future -if (UNIX AND NOT ANDROID AND NOT QNX) +if (UNIX AND NOT ANDROID AND NOT QNX AND NOT INTEGRITY) set(cxx11_future_TEST_LIBRARIES pthread) endif() qt_config_compile_test(cxx11_future diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index 49479df482..1fba18290b 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -82,6 +82,10 @@ qt_internal_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_ HAVE_USLEEP=1 ) +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION INTEGRITY + COMPILE_OPTIONS -include qplatformdefs.h +) + qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite LIBRARIES ${CMAKE_DL_LIBS} @@ -91,6 +95,3 @@ qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AN DEFINES SQLITE_OMIT_LOAD_EXTENSION ) - -#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY: -# QMAKE_CFLAGS = "-include" "qplatformdefs.h" |