summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptstring.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-03 10:54:59 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-03 10:54:59 (GMT)
commit74e29f6eaec3831ac373270101d8ad8a53fe4471 (patch)
tree500add6fa7e5724f930801aa64246a89c8ae63f4 /src/script/api/qscriptstring.cpp
parent9f85fc8847d178af0e9e9039d80cd017d1c9324b (diff)
parentd3673b331426346167e4dd1cd6c7b78ab7bf5176 (diff)
downloadQt-74e29f6eaec3831ac373270101d8ad8a53fe4471.zip
Qt-74e29f6eaec3831ac373270101d8ad8a53fe4471.tar.gz
Qt-74e29f6eaec3831ac373270101d8ad8a53fe4471.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptstring.cpp')
-rw-r--r--src/script/api/qscriptstring.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp
index 8c818e1..94b69b9 100644
--- a/src/script/api/qscriptstring.cpp
+++ b/src/script/api/qscriptstring.cpp
@@ -39,6 +39,7 @@
**
****************************************************************************/
+#include "config.h" // compile on Windows
#include "qscriptstring.h"
#include "qscriptstring_p.h"
#include "qscriptengine.h"