diff options
| author | Miroslav Safr <miroslav.safr@tieto.com> | 2010-08-24 16:30:45 +0300 |
|---|---|---|
| committer | Miroslav Safr <miroslav.safr@tieto.com> | 2010-08-24 16:54:00 +0300 |
| commit | fd590e06854fd6757f0faace959c063d27cb68e8 (patch) | |
| tree | 76969e1ef69f49824e641344177197411176cb2d /mkspecs | |
| parent | 72d54ef38bc1714d84fdadbcefe73c91b32add00 (diff) | |
Changes: first we have to load meegotouchconfig.pri before setting -Werror flag
RevBy: MaxW,(Holger)
Details: because HAVE_N900 comes from meegotouchconfig.pri
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common.pri | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mkspecs/common.pri b/mkspecs/common.pri index 5e2165e0..cd438886 100644 --- a/mkspecs/common.pri +++ b/mkspecs/common.pri @@ -10,7 +10,12 @@ QMAKE_TARGET_COPYRIGHT = Copyright (C) 2010 Nokia # Parts to build. Options: libs tests benchmarks demos doc debian #M_BUILD_PARTS = libs tests benchmarks demos doc debian -#disable werrors on windows and freemantle +# Load configure script results +!win32: { + include($${M_BUILD_TREE}/mkspecs/meegotouchconfig.pri) +} + +#disable werrors on windows and freemantle (HAVE_N900 comes from meegotouchconfig.pri) win32 { } else { contains( DEFINES, HAVE_N900 ) { @@ -34,11 +39,6 @@ mac { INCLUDEPATH += include } -# Load configure script results -!win32: { - include($${M_BUILD_TREE}/mkspecs/meegotouchconfig.pri) -} - # Load global definitions include($${M_BUILD_TREE}/mkspecs/features/meegotouch_defines.prf) @@ -97,7 +97,7 @@ unix { # Compiler configuration for all subprojects in libm -!win32-msvc*:QMAKE_CXXFLAGS += -g +!win32-msvc*:QMAKE_CXXFLAGS *= -g # To use compiler cache, "export USE_CCACHE=true" USE_CCACHE=$$(USE_CCACHE) |