summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-07 12:01:11 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-07 12:03:58 (GMT)
commit3c2b9047be4f4f835e59c13d5038b907c629451f (patch)
treed889a85c70a59dd99d7a15e40749a4632120a3fe
parent490f135caa35831646dac7e00f1c9422cb09aca9 (diff)
downloadQt-3c2b9047be4f4f835e59c13d5038b907c629451f.zip
Qt-3c2b9047be4f4f835e59c13d5038b907c629451f.tar.gz
Qt-3c2b9047be4f4f835e59c13d5038b907c629451f.tar.bz2
adjust some ifdefs so they are easy to remove with a script
In preparation of making the old QtScript back-end a separate package/solution.
-rw-r--r--src/script/qscriptable.cpp4
-rw-r--r--src/script/qscriptable_p.h4
-rw-r--r--src/script/qscriptclassdata.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/script/qscriptable.cpp b/src/script/qscriptable.cpp
index 5da9e95..94468de 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