summaryrefslogtreecommitdiffstats
path: root/examples/script/calculator
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-07-13 14:40:40 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-07-13 14:40:40 (GMT)
commitb8e928ce1d4aa7b405f10ff223178f61b0588293 (patch)
treeecd1f0cb3320fb1a09866d68cdc236d1d99ec8a4 /examples/script/calculator
parent25e76959da84fe4c40f98cf32b7b8c69e5087681 (diff)
downloadQt-b8e928ce1d4aa7b405f10ff223178f61b0588293.zip
Qt-b8e928ce1d4aa7b405f10ff223178f61b0588293.tar.gz
Qt-b8e928ce1d4aa7b405f10ff223178f61b0588293.tar.bz2
don't assert in QScriptEngine::setGlobalObject()
allow stuff to run, even though it's likely to crash/not work...
Diffstat (limited to 'examples/script/calculator')
-rw-r--r--examples/script/calculator/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/script/calculator/main.cpp b/examples/script/calculator/main.cpp
index ea03b58..6d9984a 100644
--- a/examples/script/calculator/main.cpp
+++ b/examples/script/calculator/main.cpp
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
QScriptEngine engine;
//! [0a]
-#if 0 && defined(QT_NO_SCRIPTTOOLS)
+#if !defined(QT_NO_SCRIPTTOOLS)
QScriptEngineDebugger debugger;
debugger.attachTo(&engine);
QMainWindow *debugWindow = debugger.standardWindow();
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
QScriptValue calc = ctor.construct(QScriptValueList() << scriptUi);
//! [2]
-#if 0 && defined(QT_NO_SCRIPTTOOLS)
+#if !defined(QT_NO_SCRIPTTOOLS)
QLineEdit *display = qFindChild<QLineEdit*>(ui, "display");
QObject::connect(display, SIGNAL(returnPressed()),
debugWindow, SLOT(show()));