vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #12313 from Vitallium/remove-nullptr-warning 

Variables QT_GCC_* are undefined for QPA.
1.x
Vitaly Slobodin 2014-07-15 10:10:18 +04:00
parent 05277b2d84 c166662c0d
commit 4393627a80
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qt/mkspecs/features/default_pre.prf
View File

@ -1,3 +1,12 @@
load(exclusive_builds)
### Qt 5: remove "uic" and "resources" - or add "qt"
CONFIG = lex yacc warn_on debug uic resources $$CONFIG
# Variables QT_GCC_MAJOR_VERSION and QT_GCC_MINOR_VERSION are undefined for QPA,
# therefore a few warning suppressions were not properly enabled.
qpa {
QT_GCC_VERSION = $$system(gcc -dumpversion)
QT_GCC_VERSION = $$split(QT_GCC_VERSION, ".")
QT_GCC_MAJOR_VERSION = $$first(QT_GCC_VERSION)
QT_GCC_MINOR_VERSION = $$member(QT_GCC_VERSION, 1)
}