Skip to content

Commit 51d696d

Browse files
committed
Use include global.rpi in common.prf
1 parent 22e8dc0 commit 51d696d

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

build/common.prf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ CONFIG(debug, debug|release) {
1717
TARGET = $${TARGET}_d
1818
}
1919

20+
!include(../../../global.pri)
21+
2022
isEmpty(DESTDIR) {
2123
isEmpty(GLOBAL_DESTDIR): DESTDIR = $$PWD/../bin
2224
!isEmpty(GLOBAL_DESTDIR): DESTDIR = $$GLOBAL_DESTDIR
@@ -61,3 +63,7 @@ gcc|win32-clang-msvc:QMAKE_CXXFLAGS += -Wno-deprecated-declarations -Wuninitiali
6163
win32-clang-msvc:QMAKE_CXXFLAGS += -Wno-unused-command-line-argument
6264
#Do not issue warning to system includes
6365
gcc:!isEmpty(QT_INSTALL_HEADERS): QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
66+
67+
68+
QMAKE_CXXFLAGS -= -Werror -Werror=pedantic -pedantic-errors -Werror=cast-qual
69+
clang:QMAKE_CXXFLAGS += -Wno-error

tests/tests.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ include ( ../build/common.prf )
2323
include ( ../build/PythonQt.prf )
2424
include ( ../build/PythonQt_QtAll.prf )
2525

26+
QMAKE_CXXFLAGS -= -Werror=non-virtual-dtor
27+
2628
HEADERS += \
2729
PythonQtTestCleanup.h \
2830
PythonQtTests.h

0 commit comments

Comments
 (0)