diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
| commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
| tree | 363dfd46575d147206267d854ce14747157f432e /src/plugins/sqldrivers | |
| parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) | |
Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.
Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers')
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/CMakeLists.txt | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index 6413515efe..25796d9bb5 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -61,20 +61,12 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NO HAVE_POSIX_FALLOCATE=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION WINRT AND NOT QT_FEATURE_system_sqlite - DEFINES - SQLITE_OS_WINRT -) - -#### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT: -# QMAKE_CFLAGS = "-Gy" - qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone +qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_USLEEP=1 ) @@ -89,5 +81,5 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_ SQLITE_OMIT_LOAD_EXTENSION ) -#### Keys ignored in scope 13:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY: +#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY: # QMAKE_CFLAGS = "-include" "qplatformdefs.h" diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index 8f1faeef9e..5cc2791e7d 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -71,20 +71,12 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NO HAVE_POSIX_FALLOCATE=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION WINRT AND NOT QT_FEATURE_system_sqlite - DEFINES - SQLITE_OS_WINRT -) - -#### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT: -# QMAKE_CFLAGS = "-Gy" - qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone +qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_USLEEP=1 ) @@ -99,5 +91,5 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_ SQLITE_OMIT_LOAD_EXTENSION ) -#### Keys ignored in scope 13:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY: +#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY: # QMAKE_CFLAGS = "-include" "qplatformdefs.h" |