diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-05-07 09:19:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-05-07 09:07:40 +0000 |
| commit | bf5b1d714c6eeb9a82fbf046ae18c1e63cfe6a20 (patch) | |
| tree | b8eb5867c9b690fa1d92e6285f6fc5c354e41faf /tests/unit/unittest/unittest.pro | |
| parent | 635993fbdcda6b2c9711b3f74511e8fd94cb07f3 (diff) | |
Revert "Revert "Merge remote-tracking branch 'origin/4.15'""
This reverts commit f0a86d45104f585b7aeef07fcc68cea24061aedb.
Reverting a merge doesn't "undo" it - the changes would be lost
forever even with subsequent merges.
So we need to revert the revert to get the changes.
Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
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 |