feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
This commit is contained in:
Eike Ziller
2011-10-17 14:22:32 +02:00
parent 4ea9c21932 a9eb880353
commit 8eb8368139
76 changed files with 5227 additions and 2121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -475,7 +475,7 @@ class DummyEngine : public DebuggerEngine
Q_OBJECT
public:
DummyEngine() : DebuggerEngine(DebuggerStartParameters()) {}
DummyEngine() : DebuggerEngine(DebuggerStartParameters(), AnyLanguage) {}
~DummyEngine() {}
void setupEngine() {}
@@ -1983,6 +1983,8 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine)
}
engine->watchHandler()->rebuildModel();
mainWindow()->setEngineDebugLanguages(engine->languages());
}
static void changeFontSize(QWidget *widget, qreal size)
@@ -2259,6 +2261,10 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
void DebuggerPluginPrivate::updateDebugActions()
{
//if we're currently debugging the actions are controlled by engine
if (m_currentEngine->state() != DebuggerNotReady)
return;
ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance();
Project *project = pe->startupProject();
const QString debugMode = _(Constants::DEBUGMODE);