diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-08-10 16:03:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-08-10 16:03:57 +0200 |
| commit | 99ba300ae3ab8776a39a987dc45c9c7afe75b493 (patch) | |
| tree | f1389a0980ecd0a549ebcccc54600c3ae04d6f06 /src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp | |
| parent | 01bb7443fdb848899fef41e9f661a455e2e6e4ee (diff) | |
| parent | d78d7dbce3d4a85e7f111db719dde0b943814575 (diff) | |
| download | qt-creator-99ba300ae3ab8776a39a987dc45c9c7afe75b493.tar.gz | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
src/libs/libs.pro
src/plugins/debugger/watchwindow.cpp
src/plugins/remotelinux/maemopackagecreationstep.h
Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp index a72b8c91ed..01aadc0671 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp @@ -217,6 +217,13 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf params.projectSourceDirectory = runConfig->target()->project()->projectDirectory(); params.projectSourceFiles = runConfig->target()->project()->files(Project::ExcludeGeneratedFiles); + // Makes sure that all bindings go through the JavaScript engine, so that + // breakpoints are actually hit! + const QString optimizerKey = QLatin1String("QML_DISABLE_OPTIMIZER"); + if (!params.environment.hasKey(optimizerKey)) { + params.environment.set(optimizerKey, QLatin1String("1")); + } + if (params.executable.isEmpty()) { QmlProjectPlugin::showQmlObserverToolWarning(); return 0; |