diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2021-05-06 13:06:28 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2021-05-06 13:07:48 +0200 |
| commit | 888ca0dd20ff647970fc85340e108cfa34d78c3a (patch) | |
| tree | 94ab52c0af43e5c3fd575ea270304683daf05956 /tests/unit/unittest/unittest.pro | |
| parent | 201786d3fc39f92cec4ad9eafa548e534e5cc442 (diff) | |
| parent | fb26650d86636fff7b84a7218ebcf95e089431d9 (diff) | |
Merge remote-tracking branch 'origin/4.15'
Conflicts:
src/libs/sqlite/sqlitebasestatement.h
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: I0fa0a8a7feffed24c0d2bc26eca86590f1156755
Diffstat (limited to 'tests/unit/unittest/unittest.pro')
| -rw-r--r-- | tests/unit/unittest/unittest.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro index 0f6c0d3bce..d00920fdb5 100644 --- a/tests/unit/unittest/unittest.pro +++ b/tests/unit/unittest/unittest.pro @@ -37,6 +37,9 @@ QMAKE_LFLAGS += -fno-merge-debug-strings -fuse-ld=gold CONFIG(release, debug|release):QMAKE_LFLAGS += -Wl,--strip-debug } +CONFIG(debug, debug|release): DEFINES += SQLITE_DEBUG + + gcc:!clang: QMAKE_CXXFLAGS += -Wno-noexcept-type msvc{ QMAKE_CXXFLAGS += /bigobj /wd4267 /wd4141 /wd4146 /wd4624 |