diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-02 12:32:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-02 12:32:13 (GMT) |
| commit | c4f842d4a5b61a2618c50f6c26041da4e42d029d (patch) | |
| tree | 8192d1d1a4b92e9c2cd5ab15afef908b528e59d2 | |
| parent | f6f8ba94d5f82b8df723a217a3d0ecb50e570cbc (diff) | |
| parent | 8f56e42ed665b90e084239a0560fc9c9688d0c3b (diff) | |
| download | Qt-c4f842d4a5b61a2618c50f6c26041da4e42d029d.zip Qt-c4f842d4a5b61a2618c50f6c26041da4e42d029d.tar.gz Qt-c4f842d4a5b61a2618c50f6c26041da4e42d029d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Make QtScript examples compile
| -rw-r--r-- | examples/script/customclass/main.cpp | 2 | ||||
| -rw-r--r-- | examples/script/helloscript/main.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/examples/script/customclass/main.cpp b/examples/script/customclass/main.cpp index cc79d6e..a9e8ba9 100644 --- a/examples/script/customclass/main.cpp +++ b/examples/script/customclass/main.cpp @@ -38,6 +38,8 @@ ** ****************************************************************************/ +#include <QCoreApplication> +#include <QtDebug> #include <QtScript> #include "bytearrayclass.h" diff --git a/examples/script/helloscript/main.cpp b/examples/script/helloscript/main.cpp index 3013e7c..6eac741 100644 --- a/examples/script/helloscript/main.cpp +++ b/examples/script/helloscript/main.cpp @@ -39,8 +39,11 @@ ****************************************************************************/ #include <QApplication> +#include <QFile> #include <QMessageBox> #include <QPushButton> +#include <QTextStream> +#include <QTranslator> #include <QtScript> //! [0] |