diff options
| author | mread <qt-info@nokia.com> | 2009-08-10 13:18:56 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-10 13:18:56 (GMT) |
| commit | 34dd8163f4fcd16be5677fc94ce960cc464991d5 (patch) | |
| tree | f871fef42b4f337a98bce77ad307efe079b7dc5f /src/script | |
| parent | 0dfca6e13a7ad3cce38d5509d446f76eb496f398 (diff) | |
| parent | 70e098d965318651acb725374b73e026f2946b76 (diff) | |
| download | Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.zip Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.tar.gz Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/qscriptable.cpp | 4 | ||||
| -rw-r--r-- | src/script/qscriptable_p.h | 4 | ||||
| -rw-r--r-- | src/script/qscriptclassdata.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/script/qscriptable.cpp b/src/script/qscriptable.cpp index 455cc98..a33b5ae 100644 --- a/src/script/qscriptable.cpp +++ b/src/script/qscriptable.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#ifndef QT_NO_QOBJECT - #include "qscriptable.h" +#ifndef QT_NO_QOBJECT + #ifndef QT_NO_SCRIPT #include "qscriptable_p.h" diff --git a/src/script/qscriptable_p.h b/src/script/qscriptable_p.h index 8ea65ed..1d297d9 100644 --- a/src/script/qscriptable_p.h +++ b/src/script/qscriptable_p.h @@ -55,7 +55,7 @@ // We mean it. // -#if !defined(QT_NO_QOBJECT) && !defined(QT_NO_SCRIPT) +#ifndef QT_NO_SCRIPT QT_BEGIN_NAMESPACE @@ -79,6 +79,6 @@ public: QT_END_NAMESPACE -#endif // QT_NO_QOBJECT && QT_NO_SCRIPT +#endif // QT_NO_SCRIPT #endif diff --git a/src/script/qscriptclassdata.cpp b/src/script/qscriptclassdata.cpp index 08e7220..576a519 100644 --- a/src/script/qscriptclassdata.cpp +++ b/src/script/qscriptclassdata.cpp @@ -114,4 +114,4 @@ QScriptClassDataIterator::~QScriptClassDataIterator() QT_END_NAMESPACE -#endif +#endif // QT_NO_SCRIPT |