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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
This commit is contained in:
Eike Ziller
2012-10-04 12:23:39 +02:00
parent d2bf853ca1 ed86a7ca58
commit db4311d5b5
110 changed files with 2246 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ void IDocument::setRestoredFrom(const QString &name)
m_restored = true;
InfoBarEntry info(QLatin1String(kRestoredAutoSave),
tr("File was restored from auto-saved copy. "
"Use <i>Save</i> to confirm, or <i>Revert to Saved</i> to discard changes."));
"Select Save to confirm or Revert to Saved to discard changes."));
infoBar()->addInfo(info);
}

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

@@ -186,7 +186,7 @@ MainWindow::MainWindow() :
QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG));
QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR));
QString baseName = QApplication::style()->objectName();
#ifdef Q_WS_X11
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
if (baseName == QLatin1String("windows")) {
// Sometimes we get the standard windows 95 style as a fallback
// e.g. if we are running on a KDE4 desktop