diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-13 09:14:09 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 18:31:40 +0100 |
| commit | 6b2535ea15cdbdb2355416b604f072fc13ff36b2 (patch) | |
| tree | 4bf1560bab77c8b315850c5337ba31a0ea87b5f0 /mkspecs/wasm-emscripten | |
| parent | 54c2cebabdda0280b8443c6947b6fee02445e138 (diff) | |
| parent | 67491e2df5357706dbf88ddaf1f030ff095b4528 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/widgets/graphicsview/boxes/scene.h
src/corelib/Qt5CoreMacros.cmake
src/corelib/Qt6CoreMacros.cmake
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket.h
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
src/testlib/CMakeLists.txt
src/testlib/.prev_CMakeLists.txt
tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
Diffstat (limited to 'mkspecs/wasm-emscripten')
| -rw-r--r-- | mkspecs/wasm-emscripten/qmake.conf | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf index 8773e1bd00..e6a9773482 100644 --- a/mkspecs/wasm-emscripten/qmake.conf +++ b/mkspecs/wasm-emscripten/qmake.conf @@ -51,34 +51,8 @@ EMCC_COMMON_LFLAGS_DEBUG = \ # -s SOCKET_DEBUG \ #print out socket,network data transfer -s GL_DEBUG=1 -# Set up debug/optimization flags -QMAKE_CXXFLAGS_RELEASE -= -O2 -QMAKE_CFLAGS_RELEASE -= -O2 -equals(WASM_OBJECT_FILES, 1) { - QMAKE_LFLAGS_DEBUG += -g - - QMAKE_CXXFLAGS_RELEASE += -O3 - QMAKE_CFLAGS_RELEASE += -O3 - QMAKE_LFLAGS_RELEASE += -O3 - QMAKE_CFLAGS_OPTIMIZE += -O3 - QMAKE_CFLAGS_OPTIMIZE_FULL += -Oz -} else { - # Practical debugging setup: - # "-g4" preserves function names for stack traces - # "-Os" produces reasonably sized binaries - QMAKE_CFLAGS_DEBUG -= -g - QMAKE_CXXFLAGS_DEBUG -= -g - QMAKE_CFLAGS_DEBUG += -Os -g4 - QMAKE_CXXFLAGS_DEBUG += -Os -g4 - QMAKE_LFLAGS_DEBUG += -Os -g4 - - QMAKE_CXXFLAGS_RELEASE += -O3 - QMAKE_CFLAGS_RELEASE += -O3 - QMAKE_LFLAGS_RELEASE += -O3 - QMAKE_CFLAGS_OPTIMIZE += -O3 - QMAKE_CFLAGS_OPTIMIZE_FULL += -Oz -} - +QMAKE_LFLAGS_DEBUG += -g +QMAKE_LFLAGS_RELEASE += -O2 QMAKE_COMPILER += emscripten |