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:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
This commit is contained in:
Eike Ziller
2012-11-30 16:38:22 +01:00
parent 61c3de01a8 de4fd54c76
commit d719eebfdc
54 changed files with 15167 additions and 5902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/dialogs/newdialog.ui
View File

@@ -10,12 +10,6 @@
<height>520</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>

4
src/plugins/coreplugin/editormanager/editorview.cpp
View File

@@ -63,10 +63,6 @@
#include <QSplitter>
#include <QStackedLayout>
#ifdef Q_OS_MAC
#include <qmacstyle_mac.h>
#endif
using namespace Core;
using namespace Core::Internal;

3
src/plugins/coreplugin/editormanager/openeditorsview.cpp
View File

@@ -51,9 +51,6 @@
#include <QHeaderView>
#include <QKeyEvent>
#include <QTreeView>
#ifdef Q_OS_MAC
#include <qmacstyle_mac.h>
#endif
using namespace Core;
using namespace Core::Internal;

13
src/plugins/coreplugin/fileutils.cpp
View File

@@ -95,11 +95,11 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const QString &pathIn)
"Could not find explorer.exe in path to launch Windows Explorer."));
return;
}
QString param;
QStringList param;
if (!QFileInfo(pathIn).isDir())
param = QLatin1String("/select,");
param += QLatin1String("/select,");
param += QDir::toNativeSeparators(pathIn);
QProcess::startDetached(explorer, QStringList(param));
QProcess::startDetached(explorer, param);
#elif defined(Q_OS_MAC)
Q_UNUSED(parent)
QStringList scriptArgs;
@@ -193,12 +193,13 @@ void FileUtils::removeFile(const QString &filePath, bool deleteFromFS)
static inline bool fileSystemRenameFile(const QString &orgFilePath,
const QString &newFilePath)
{
#if QT_VERSION < 0x050000 // ### fixme: QTBUG-3570 might be fixed in Qt 5?
QFile f(orgFilePath); // Due to QTBUG-3570
QAbstractFileEngine *fileEngine = f.fileEngine();
#if QT_VERSION < 0x050000
QAbstractFileEngine *fileEngine = QAbstractFileEngine::create(orgFilePath); // Due to QTBUG-3570
if (!fileEngine->caseSensitive() && orgFilePath.compare(newFilePath, Qt::CaseInsensitive) == 0)
return fileEngine->rename(newFilePath);
#endif
// QTBUG-3570 is also valid for Qt 5 but QAbstractFileEngine is now in a private header file and
// the symbol is not exported.
return QFile::rename(orgFilePath, newFilePath);
}