diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-31 15:33:12 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-31 15:33:12 (GMT) |
commit | 73fc68802d8c0c8d3d499b279782ce270f1c5bc6 (patch) | |
tree | 8cd7f54bc06864a741f0a2fd34412124c53e5953 /mkspecs | |
parent | 9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc (diff) | |
parent | 570f8970bea646055583671397c3d2706ac45004 (diff) | |
download | Qt-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.zip Qt-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.tar.gz Qt-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.tar.bz2 |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/symbian/qt_config.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/qt_config.prf b/mkspecs/features/symbian/qt_config.prf index 82c1862..1afd22c 100644 --- a/mkspecs/features/symbian/qt_config.prf +++ b/mkspecs/features/symbian/qt_config.prf @@ -3,7 +3,7 @@ load(qt_config) !contains(QMAKE_HOST.os, "Windows") { # Test for the existence of lower cased headers, a sign of using Gnupoc. # Note that the qmake "exists" test won't do because it is case insensitive. - system("test -f $${EPOCROOT}epoc32/include/akndoc.h") { + system("test -f $${EPOCROOT}epoc32/include/akndoc.h") | system("test -f $${EPOCROOT}epoc32/include/mw/akndoc.h") { CONFIG += is_using_gnupoc } } |