Remove annoying compilation flags

trikset · May 22, 2019 · 28c77ab · 28c77ab
1 parent 5342f50
commit 28c77ab
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/global.pri b/global.pri
@@ -202,7 +202,6 @@ UI_DIR = .build/$$CONFIGURATION/ui
 
 PRECOMPILED_HEADER = $$PWD/pch.h
 CONFIG += precompile_header
-QMAKE_CXXFLAGS *= -Winvalid-pch
 
 INCLUDEPATH += $$_PRO_FILE_PWD_ \
 	$$_PRO_FILE_PWD_/include/$$PROJECT_NAME \

diff --git a/qslog/QsLog.pri b/qslog/QsLog.pri
@@ -3,8 +3,6 @@ INCLUDEPATH += $$PWD
 # WARNING: QS_LOG_LINE_NUMBERS and QS_LOG_SEPARATE_THREAD were removed from repo version and made enabled by default
 #DEFINES += QS_LOG_DISABLE         # logging code is replaced with a no-op
 
-enableFlagIfCan(-Wno-terminate)
-
 SOURCES += \
 	$$PWD/QsLogDest.cpp \
 	$$PWD/QsLog.cpp \

diff --git a/scripts/script.sh b/scripts/script.sh
@@ -41,7 +41,7 @@ $EXECUTOR bash -ic "{ [ -r /root/.bashrc ] && source /root/.bashrc || true ; } ;
 
 for t in trikKernelTests trikCameraPhotoTests trikCommunicatorTests trikScriptRunnerTests
   do
-    $EXECUTOR env DISPLAY=:0 QT_QPA_PLATFORM=minimal ASAN_OPTIONS='detect_leaks=0 detect_stack_use_after_return=true' \
+    $EXECUTOR env DISPLAY=:0 ASAN_OPTIONS='detect_leaks=0 detect_stack_use_after_return=1' \
     LSAN_OPTIONS='detect_leaks=0 suppressions=asan.supp fast_unwind_on_malloc=0' sh -c \
     "cd  $BUILDDIR/bin/x86-$CONFIG && \
      { \