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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
This commit is contained in:
Eike Ziller
2014-03-04 14:04:07 +01:00
parent 73c5eae311 3ee64ed699
commit 3ba9db48ed
72 changed files with 499 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
View File

@@ -232,7 +232,8 @@ void ReadOnlyFilesDialog::promptFailWarning(const QStringList &files, ReadOnlyRe
} else {
title = tr("Could Not Change Permissions on Some Files");
message = d->failWarning;
message += tr("\nSee details for a complete list of files.");
message += QLatin1Char('\n');
message += tr("See details for a complete list of files.");
details = files.join(QLatin1String("\n"));
}
QMessageBox msgBox(QMessageBox::Warning, title, message);

2
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -349,7 +349,6 @@ void MainWindow::extensionsInitialized()
updateContext();
emit m_coreImpl->coreAboutToOpen();
show();
// Delay restoreWindowState, since it is overridden by LayoutRequest event
QTimer::singleShot(0, this, SLOT(restoreWindowState()));
QTimer::singleShot(0, m_coreImpl, SIGNAL(coreOpened()));
@@ -1270,4 +1269,5 @@ void MainWindow::restoreWindowState()
resize(1008, 700); // size without window decoration
restoreState(m_settings->value(QLatin1String(windowStateKey)).toByteArray());
m_settings->endGroup();
show();
}