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 /src | |
| 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 'src')
| -rw-r--r-- | src/corelib/global/global.pri | 2 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 12 | ||||
| -rw-r--r-- | src/gui/dialogs/dialogs.pri | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 4800716..86800ef 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -27,3 +27,5 @@ linux*:!static:!linux-armcc:!linux-gcce { # Compensate for lack of platform defines in Symbian3 and Symbian4 symbian: DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_)) + +include(../../../tools/shared/symbian/epocroot.pri) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 957abbf..acacf7c 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -62,6 +62,10 @@ QT_END_NAMESPACE # include "private/qcore_mac_p.h" #endif +#ifdef QLIBRARYINFO_EPOCROOT +# include "symbian/epocroot.h" +#endif + #include "qconfig.cpp" QT_BEGIN_NAMESPACE @@ -433,6 +437,14 @@ QLibraryInfo::location(LibraryLocation loc) QString::fromLocal8Bit(qgetenv(ret.mid(rep + 2, reg_var.matchedLength() - 3).toLatin1().constData()).constData())); } + +#ifdef QLIBRARYINFO_EPOCROOT + // $${EPOCROOT} is a special case, resolve it similarly to qmake. + QRegExp epocrootMatcher(QLatin1String("\\$\\$\\{EPOCROOT\\}")); + if ((rep = epocrootMatcher.indexIn(ret)) != -1) + ret.replace(rep, epocrootMatcher.matchedLength(), epocRoot()); +#endif + config->endGroup(); } } diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri index c7cb794..443c5e9 100644 --- a/src/gui/dialogs/dialogs.pri +++ b/src/gui/dialogs/dialogs.pri @@ -108,7 +108,7 @@ SOURCES += \ dialogs/qwizard.cpp \ dialogs/qprintpreviewdialog.cpp -contains(QT_CONFIG, s60) { +symbian:contains(QT_CONFIG, s60) { LIBS += -lcommondialogs \ -lavkon \ -lplatformenv \ |