diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-02-18 09:09:01 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-02-18 09:09:01 (GMT) |
| commit | a0659d940985e9278a08801c3035a71329671af0 (patch) | |
| tree | 2e2c09000643e65a14564fe44c91acf457f1dc4e /src | |
| parent | 92465142116ed140b4323c4a8f5bc325c45cdccf (diff) | |
| parent | 342b916ab4fb1a9c6f3a2608e7c5a43d6a763981 (diff) | |
| download | Qt-a0659d940985e9278a08801c3035a71329671af0.zip Qt-a0659d940985e9278a08801c3035a71329671af0.tar.gz Qt-a0659d940985e9278a08801c3035a71329671af0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src')
| -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 |