diff -r b72c6db6890b -r 5dc02b23752f src/qbase.pri --- a/src/qbase.pri Wed Jun 23 19:07:03 2010 +0300 +++ b/src/qbase.pri Tue Jul 06 15:10:48 2010 +0300 @@ -4,7 +4,7 @@ isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.6.3 + VERSION=4.7.0 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } @@ -90,6 +90,7 @@ !static: DEFINES+=QT_MAKEDLL } symbian { + DEFINES += QT_QCHAR_CONSTRUCTOR # load the environment specific feature definitions exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) { load($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) @@ -109,7 +110,7 @@ # built in this exact environment. *Never* use this when building a version # for release. contains(CONFIG, def_files) { - defFilePath=../s60installs + DEF_FILE=../s60installs } } load(armcc_warnings) @@ -162,6 +163,7 @@ DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code +DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end