Commit b0125178 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.5'

parents 05866e79 41cbb6cd
......@@ -68,9 +68,9 @@ Rectangle {
width: 1
height: line.height
color: "#c4c4c4"
anchors.left: recentSessions.right
anchors.left: sessions.right
anchors.leftMargin: -1
anchors.top: recentSessions.top
anchors.top: sessions.top
}
......@@ -81,9 +81,9 @@ Rectangle {
height: 432
id: recentProjects
anchors.left: recentlyUsedProjects.left
anchors.left: recentProjectsTitle.left
anchors.top: recentlyUsedProjects.bottom
anchors.top: recentProjectsTitle.bottom
anchors.topMargin: 20
anchors.bottom: parent.bottom
anchors.bottomMargin: 40
......@@ -104,26 +104,26 @@ Rectangle {
}
Text {
id: recentlyUsedSessions
id: sessionsTitle
x: pageCaption.x + pageCaption.textOffset
y: 105
color: "#535353"
text: qsTr("Recently used sessions")
text: qsTr("Sessions")
font.pixelSize: 16
font.family: "Helvetica"
font.bold: true
}
Text {
id: recentlyUsedProjects
id: recentProjectsTitle
x: 406
y: 105
color: "#535353"
text: qsTr("Recently used Projects")
anchors.left: recentlyUsedSessions.right
text: qsTr("Recent Projects")
anchors.left: sessionsTitle.right
anchors.leftMargin: 160
font.bold: true
font.family: "Helvetica"
......@@ -139,7 +139,7 @@ Rectangle {
height: 70
anchors.topMargin: 42
anchors.top: recentSessions.bottom
anchors.top: sessions.bottom
LinkedText {
id: openProject
......@@ -169,17 +169,17 @@ Rectangle {
}
}
RecentSessions {
id: recentSessions
Sessions {
id: sessions
x: 87
y: 144
width: 274
anchors.left: recentlyUsedSessions.left
anchors.right: recentlyUsedProjects.left
anchors.left: sessionsTitle.left
anchors.right: recentProjectsTitle.left
anchors.rightMargin: 40
anchors.top: recentlyUsedSessions.bottom
anchors.top: sessionsTitle.bottom
anchors.topMargin: 20
model: sessionList
......
......@@ -459,34 +459,24 @@ void QmlCppEngine::runEngine()
void QmlCppEngine::shutdownInferior()
{
EDEBUG("\nMASTER SHUTDOWN INFERIOR");
d->m_cppEngine->quitDebugger();
d->m_qmlEngine->quitDebugger();
d->m_cppEngine->shutdownInferior();
}
void QmlCppEngine::shutdownEngine()
{
EDEBUG("\nMASTER SHUTDOWN ENGINE");
d->m_qmlEngine->shutdownSlaveEngine();
d->m_cppEngine->shutdownSlaveEngine();
}
void QmlCppEngine::quitDebugger()
{
// we might get called multiple times
if (targetState() == DebuggerFinished)
return;
EDEBUG("\nMASTER QUIT DEBUGGER");
setTargetState(DebuggerFinished);
d->m_qmlEngine->quitDebugger();
d->m_cppEngine->quitDebugger();
}
void QmlCppEngine::abortDebugger()
{
EDEBUG("\nMASTER ABORT DEBUGGER");
setTargetState(DebuggerFinished);
d->m_qmlEngine->abortDebugger();
d->m_cppEngine->abortDebugger();
}
......@@ -668,9 +658,8 @@ void QmlCppEngine::slaveEngineStateChanged
break;
}
case InferiorExitOk: {
// State can be reached by different states ...
qmlEngine()->quitDebugger();
notifyInferiorExited();
// InferiorExitOk will be called through notifyInferiorExited
// when InferiorShutDownOk is reached
break;
}
case InferiorShutdownRequested: {
......@@ -687,11 +676,12 @@ void QmlCppEngine::slaveEngineStateChanged
break;
}
case InferiorShutdownOk: {
QTC_ASSERT(state() == InferiorShutdownRequested
|| state() == EngineRunFailed
|| state() == InferiorSetupFailed, qDebug() << state());
if (state() == InferiorShutdownRequested)
notifyInferiorShutdownOk();
else {
// we got InferiorExitOk before, but ignored it ...
notifyInferiorExited();
}
break;
}
case EngineShutdownRequested: {
......@@ -750,7 +740,8 @@ void QmlCppEngine::slaveEngineStateChanged
notifyInferiorRunOk();
}
} else if (newState == EngineRunFailed) {
d->m_cppEngine->quitDebugger();
if (d->m_cppEngine->targetState() != DebuggerFinished)
d->m_cppEngine->quitDebugger();
}
}
}
......
......@@ -861,13 +861,14 @@ void QmlEngine::attemptBreakpointSynchronization()
BreakHandler *handler = breakHandler();
DebuggerEngine *bpOwner = isSlaveEngine() ? masterEngine() : this;
foreach (BreakpointModelId id, handler->unclaimedBreakpointIds()) {
// Take ownership of the breakpoint. Requests insertion.
if (acceptsBreakpoint(id))
handler->setEngine(id, this);
handler->setEngine(id, bpOwner);
}
foreach (BreakpointModelId id, handler->engineBreakpointIds(this)) {
foreach (BreakpointModelId id, handler->engineBreakpointIds(bpOwner)) {
switch (handler->state(id)) {
case BreakpointNew:
// Should not happen once claimed.
......
......@@ -620,9 +620,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
connect(mfile->menu(), SIGNAL(aboutToShow()),
this, SLOT(updateRecentProjectMenu()));
// recent session menu
// session menu
Core::ActionContainer *msession = am->createMenu(Constants::M_SESSION);
msession->menu()->setTitle(tr("Recent Sessions"));
msession->menu()->setTitle(tr("Sessions"));
msession->setOnAllDisabledBehavior(Core::ActionContainer::Show);
mfile->addMenu(msession, Core::Constants::G_FILE_OPEN);
d->m_sessionMenu = msession->menu();
......
......@@ -138,6 +138,7 @@ Qt4TargetSetupWidget *Qt4DesktopTargetFactory::createTargetSetupWidget(const QSt
return 0;
Qt4DefaultTargetSetupWidget *widget = new Qt4DefaultTargetSetupWidget(this, id, proFilePath, infos,
minimumQtVersion, maximumQtVersion,
requiredFeatures,
importEnabled, importInfos,
Qt4DefaultTargetSetupWidget::USER);
widget->setBuildConfiguraionComboBoxVisible(true);
......
......@@ -107,7 +107,8 @@ Qt4TargetSetupWidget *Qt4BaseTargetFactory::createTargetSetupWidget(const QStrin
const bool supportsShadowBuilds
= targetFeatures(id).contains(QLatin1String(Constants::SHADOWBUILD_TARGETFEATURE_ID));
Qt4DefaultTargetSetupWidget *widget
= new Qt4DefaultTargetSetupWidget(this, id, proFilePath, infos, minimumQtVersion, maximumQtVersion,
= new Qt4DefaultTargetSetupWidget(this, id, proFilePath, infos,
minimumQtVersion, maximumQtVersion, requiredFeatures,
importEnabled && supportsShadowBuilds, importInfos,
(supportsShadowBuilds
? Qt4DefaultTargetSetupWidget::ENABLE
......@@ -490,6 +491,7 @@ Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *f
const QList<BuildConfigurationInfo> &infos,
const QtSupport::QtVersionNumber &minimumQtVersion,
const QtSupport::QtVersionNumber &maximumQtVersion,
const Core::FeatureSet &requiredFeatures,
bool importEnabled,
const QList<BuildConfigurationInfo> &importInfos,
ShadowBuildOption shadowBuild)
......@@ -499,6 +501,7 @@ Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *f
m_proFilePath(proFilePath),
m_minimumQtVersion(minimumQtVersion),
m_maximumQtVersion(maximumQtVersion),
m_requiredFeatures(requiredFeatures),
m_importInfos(importInfos),
m_directoriesEnabled(true),
m_hasInSourceBuild(false),
......@@ -726,7 +729,7 @@ void Qt4DefaultTargetSetupWidget::setProFilePath(const QString &proFilePath)
proFilePath,
m_minimumQtVersion,
m_maximumQtVersion,
Core::FeatureSet()),
m_requiredFeatures),
false);
}
......
......@@ -122,6 +122,7 @@ public:
const QList<BuildConfigurationInfo> &info,
const QtSupport::QtVersionNumber &minimumQtVersion,
const QtSupport::QtVersionNumber &maximumQtVersion,
const Core::FeatureSet &requiredFeatures,
bool importEnabled,
const QList<BuildConfigurationInfo> &importInfos,
ShadowBuildOption shadowBuild);
......@@ -165,6 +166,7 @@ private:
QString m_proFilePath;
QtSupport::QtVersionNumber m_minimumQtVersion;
QtSupport::QtVersionNumber m_maximumQtVersion;
Core::FeatureSet m_requiredFeatures;
Utils::DetailsWidget *m_detailsWidget;
QGridLayout *m_importLayout;
QGridLayout *m_newBuildsLayout;
......
......@@ -7,10 +7,14 @@ include(../../../qtcreator.pri)
# global state of the CRT, reconsider if other DLLs are required!
# TODO: No effect, currently?
QMAKE_CXXFLAGS_RELEASE -= -MD
QMAKE_CXXFLAGS_DEBUG -= -MDd
QMAKE_CXXFLAGS_RELEASE += -MT
QMAKE_CXXFLAGS_DEBUG += -MT
win32-msvc* {
QMAKE_CXXFLAGS_RELEASE -= -MD
QMAKE_CXXFLAGS_DEBUG -= -MDd
QMAKE_CXXFLAGS_RELEASE += -MT
QMAKE_CXXFLAGS_DEBUG += -MT
} else {
QMAKE_CXXFLAGS += -static
}
SOURCES = win64interrupt.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment