diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-11-19 10:31:47 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-11-19 10:31:47 (GMT) |
| commit | 45ffd89f55a7769c66f6cf15e54994a264012f05 (patch) | |
| tree | c3e3b613bca6bed12e9601eca3891319584af5f9 /qmake/qmake.pri | |
| parent | 00e99440596d8bf648aefdfbb00e80004e328033 (diff) | |
| parent | 742eb0b52e69aa3406d23293108271fdc245e4d8 (diff) | |
| download | Qt-45ffd89f55a7769c66f6cf15e54994a264012f05.zip Qt-45ffd89f55a7769c66f6cf15e54994a264012f05.tar.gz Qt-45ffd89f55a7769c66f6cf15e54994a264012f05.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'qmake/qmake.pri')
| -rw-r--r-- | qmake/qmake.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 36c5d36..7cf94cb 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -3,7 +3,7 @@ CONFIG += depend_includepath QMAKE_INCREMENTAL = SKIP_DEPENDS += qconfig.h qmodules.h DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_STL QT_NO_COMPRESS QT_NO_UNICODETABLES \ - QT_NO_GEOM_VARIANT QT_NO_DATASTREAM + QT_NO_GEOM_VARIANT QT_NO_DATASTREAM QLIBRARYINFO_EPOCROOT #qmake code SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ |