diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/wasm/wasm.conf | 1 | ||||
| -rw-r--r-- | mkspecs/features/android/sdk.prf | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index 68980ff5cf..72fe0ec34e 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -60,7 +60,7 @@ QMAKE_CFLAGS_SHANI = $$QMAKE_CFLAGS_SSE2 QMAKE_CXX = $$QMAKE_CC QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 -w44996 +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO diff --git a/mkspecs/common/wasm/wasm.conf b/mkspecs/common/wasm/wasm.conf index 2a5ea23145..51fa9d7ceb 100644 --- a/mkspecs/common/wasm/wasm.conf +++ b/mkspecs/common/wasm/wasm.conf @@ -42,7 +42,6 @@ EMCC_COMMON_LFLAGS += \ # but are here in debug for clarity. EMCC_COMMON_LFLAGS_DEBUG = \ $$EMCC_COMMON_LFLAGS \ - -s DEMANGLE_SUPPORT=1 \ # -s LIBRARY_DEBUG=1 \ #print out library calls, verbose # -s SYSCALL_DEBUG=1 \ #print out sys calls, verbose # -s FS_LOG=1 \ #print out filesystem ops, verbose diff --git a/mkspecs/features/android/sdk.prf b/mkspecs/features/android/sdk.prf index 252c234e33..536fd74eee 100644 --- a/mkspecs/features/android/sdk.prf +++ b/mkspecs/features/android/sdk.prf @@ -1,6 +1,6 @@ API_VERSION_TO_USE = $$(ANDROID_API_VERSION) isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION -isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-33 +isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-34 ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar !exists($$ANDROID_JAR_FILE) { |