diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-18 12:23:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-18 12:23:32 (GMT) |
| commit | a764519a658031ce2fb375b659ff889b5241357f (patch) | |
| tree | 01f051450ddf844ea766a25fd6767fadacd77ed9 /mkspecs | |
| parent | 437a67eb055c688ea4b778f5cfc9132fe02063c6 (diff) | |
| parent | 4e23d00dabc3465bd683d38ee147b3a9897b226f (diff) | |
| download | Qt-a764519a658031ce2fb375b659ff889b5241357f.zip Qt-a764519a658031ce2fb375b659ff889b5241357f.tar.gz Qt-a764519a658031ce2fb375b659ff889b5241357f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Workaround for compiler error with MWCC (Symbian emulator)
Describe patch-capabilities in the install instructions.
Remove qmake warning by using appropriate variable.
Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has changed /epoc32/include layout, including a subdirectory called "platform".
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/platform_paths.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf index f5caae0..c723d8c 100644 --- a/mkspecs/features/symbian/platform_paths.prf +++ b/mkspecs/features/symbian/platform_paths.prf @@ -59,7 +59,7 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) { # No platform specific paths provided, use default paths - exists($${EPOCROOT}epoc32/include/platform) { # New SF structure + exists($${EPOCROOT}epoc32/include/mw) { # New SF structure # --------------------------------------- # Location, where the applications layer specific public headers are exported |