diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 04:45:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 04:45:22 (GMT) |
| commit | fbacd0fb2eb41470b090a3cbca7535f78689a382 (patch) | |
| tree | 4f6ca32958fd9c5c95ae9ca2f599bf56067d2c45 /qmake | |
| parent | 3e94b3a77affeef80544e48949e018ced4e0d96e (diff) | |
| parent | 9f0884773a451a4feef80812e015266bd487dcdc (diff) | |
| download | Qt-fbacd0fb2eb41470b090a3cbca7535f78689a382.zip Qt-fbacd0fb2eb41470b090a3cbca7535f78689a382.tar.gz Qt-fbacd0fb2eb41470b090a3cbca7535f78689a382.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits)
Revert Merge Request 551. This introduces regressions to Qt.
Fixed scroll area size calculation on Mac.
Fix a race where QThread::exit() is "lost" when called after start()
make a partial build of linguist in no-gui config
make the code less of a trap
fix build from top level
Partially revert MR 543 changes to Linguist.
Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
Autotest: add some debugging, just in case there's something wrong
Autotest: fix the fix for the rounding error.
Fix compile error with QT_NO_LIBRARY in QtMultimedia
the _setmode() prototype is different on win ce
qdoc: Changed qdoc to output the new doc format.
Doc: update 'developing on mac'
fcntl.h doesn't seem to exist, either - contrary to an example on msdn
Autotest: fix paths on the test server after update.
Force the repaint during a window resize.
fix compile on wince
remove CONFIG += ordered again
Assistant: Check namespace and virtual folder syntax of help projects.
...
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/option.cpp | 2 | ||||
| -rw-r--r-- | qmake/qmake.pri | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index d7c5397..49030c3 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -613,7 +613,7 @@ bool Option::postProcessProject(QMakeProject *project) QString Option::fixString(QString string, uchar flags) { - const QString orig_string = string; + //const QString orig_string = string; static QHash<FixStringCacheKey, QString> *cache = 0; if(!cache) { cache = new QHash<FixStringCacheKey, QString>; diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 0821f00..281417c 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -14,6 +14,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \ generators/win32/msvc_vcproj.cpp \ generators/win32/msvc_objectmodel.cpp \ + generators/symbian/symbiancommon.cpp \ generators/symbian/symmake.cpp \ generators/symbian/symmake_abld.cpp \ generators/symbian/symmake_sbsv2.cpp \ @@ -28,6 +29,7 @@ HEADERS += project.h property.h generators/makefile.h \ generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \ generators/win32/msvc_vcproj.h \ generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \ + generators/symbian/symbiancommon.h \ generators/symbian/symmake.h \ generators/symbian/symmake_abld.h \ generators/symbian/symmake_sbsv2.h \ |