diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-13 06:01:46 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-13 06:01:46 (GMT) |
| commit | a7f21de784bb50d61f299eb8d6d080a8c6fac6b5 (patch) | |
| tree | 5c4f33495463b759bd6fb541fcf404f5ad081095 /src/script/qscriptable_p.h | |
| parent | 72f565838c5d9f8ee8984d2a7b3586b1d51e656d (diff) | |
| parent | 6c3a6629de59898a3ea38181a1623896810c576e (diff) | |
| download | Qt-a7f21de784bb50d61f299eb8d6d080a8c6fac6b5.zip Qt-a7f21de784bb50d61f299eb8d6d080a8c6fac6b5.tar.gz Qt-a7f21de784bb50d61f299eb8d6d080a8c6fac6b5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/script/qscriptable_p.h')
| -rw-r--r-- | src/script/qscriptable_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/qscriptable_p.h b/src/script/qscriptable_p.h index 8ea65ed..c8400e0 100644 --- a/src/script/qscriptable_p.h +++ b/src/script/qscriptable_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -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 |