diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 09:09:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 09:09:13 (GMT) |
| commit | 7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508 (patch) | |
| tree | 07631bea961291317cfe835a0204bd1a76e0532b /src/corelib | |
| parent | 01cf14ef278f564936eff9a392679526fe14e530 (diff) | |
| parent | 342b916ab4fb1a9c6f3a2608e7c5a43d6a763981 (diff) | |
| download | Qt-7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508.zip Qt-7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508.tar.gz Qt-7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508.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:
Use correct include path for qglobal.h
Fixed softkey localizaton to comile also on platforms without softkeys.
Use correct (forward slash) separators in qmake-generated bld.inf
Support for dynamic localization in Symbian softkeys.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/qatomic_symbian.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/arch/qatomic_symbian.h b/src/corelib/arch/qatomic_symbian.h index f1d332f..fa4e4a9 100644 --- a/src/corelib/arch/qatomic_symbian.h +++ b/src/corelib/arch/qatomic_symbian.h @@ -42,7 +42,7 @@ #ifndef QATOMIC_SYMBIAN_H #define QATOMIC_SYMBIAN_H -#include <qglobal.h> +#include <QtCore/qglobal.h> #include <e32std.h> QT_BEGIN_HEADER |