From 1d5091e48f6df341dbd4436843c25afe25cbf4ce Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Thu, 28 Aug 2014 17:33:47 +0200
Subject: [PATCH] Do not use deprecated Qt functionality.
Replace all* remaining deprecated Qt 4 functions with
their Qt 5 counterparts. This means we no longer need to
define the QT_DISABLE_DEPRECATED_BEFORE macro.
This patch is relatively small because most source-compatible
changes of this kind have been done before.
* The one exception is the QmlDesigner, which uses QWeakPointer
in a deprecated way all over the place.
Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
qtcreator.pri | 1 -
qtcreator.qbs | 1 -
.../qml/qmlpuppet/qmlpuppet/qmlpuppet.pri | 1 +
.../qml/qmlpuppet/qmlpuppet/qmlpuppet.pro | 4 --
src/app/main.cpp | 10 +---
src/libs/extensionsystem/pluginview.cpp | 4 +-
src/libs/ssh/sshkeycreationdialog.cpp | 4 +-
src/libs/utils/basetreeview.cpp | 2 +-
src/libs/utils/environmentmodel.cpp | 4 +-
src/libs/utils/filesearch.cpp | 6 +-
src/libs/utils/headerviewstretcher.cpp | 7 ++-
src/libs/utils/navigationtreeview.cpp | 2 +-
src/libs/utils/pathchooser.cpp | 4 +-
src/plugins/android/androidsettingswidget.cpp | 4 +-
.../artisticstyle/artisticstylesettings.cpp | 2 +-
.../uncrustify/uncrustifysettings.cpp | 2 +-
.../clangcodemodel/clangcompletion.cpp | 6 +-
.../completionproposalsbuilder.cpp | 24 ++++----
.../test/clangcompletion_test.cpp | 10 ++--
src/plugins/cmakeprojectmanager/cmaketool.cpp | 4 +-
.../coreplugin/dialogs/externaltoolconfig.cpp | 1 -
.../editormanager/openeditorsview.cpp | 4 +-
src/plugins/coreplugin/externaltool.cpp | 2 +-
.../coreplugin/locator/locatorwidget.cpp | 2 +-
src/plugins/cppeditor/cpphoverhandler.cpp | 2 +-
src/plugins/cpptools/cppcompletionassist.cpp | 6 +-
src/plugins/debugger/debuggeroptionspage.cpp | 6 +-
.../debugger/qml/qscriptdebuggerclient.cpp | 4 +-
src/plugins/debugger/sourcefileshandler.cpp | 2 +-
src/plugins/debugger/watchdata.cpp | 27 +--------
src/plugins/debugger/watchhandler.cpp | 3 +-
src/plugins/fakevim/fakevimplugin.cpp | 4 +-
src/plugins/git/gitorious/gitorious.cpp | 7 ++-
src/plugins/glsleditor/glslhoverhandler.cpp | 2 +-
src/plugins/help/openpageswidget.cpp | 4 +-
.../projectexplorer/devicesupport/idevice.cpp | 4 +-
.../projectexplorer/environmentwidget.cpp | 4 +-
src/plugins/projectexplorer/gcctoolchain.cpp | 2 +-
.../projectexplorer/kitoptionspage.cpp | 2 +-
.../projectexplorer/projectwelcomepage.cpp | 34 ++++++-----
.../projectexplorer/projectwelcomepage.h | 2 +
.../projectexplorer/toolchainoptionspage.cpp | 4 +-
.../itemlibrary/itemlibrarymodel.cpp | 7 ++-
.../components/itemlibrary/itemlibrarymodel.h | 1 +
.../itemlibrary/itemlibrarysectionmodel.cpp | 7 ++-
.../itemlibrary/itemlibrarysectionmodel.h | 1 +
.../navigator/navigatortreemodel.cpp | 7 ++-
.../components/navigator/navigatortreemodel.h | 1 +
.../components/navigator/navigatorview.cpp | 2 +-
.../stateseditor/stateseditormodel.cpp | 14 +++--
.../stateseditor/stateseditormodel.h | 1 +
src/plugins/qmldesigner/qmldesignerplugin.pro | 1 +
src/plugins/qmljseditor/qmloutlinemodel.cpp | 8 ++-
src/plugins/qmljseditor/qmloutlinemodel.h | 1 +
.../qmlprofiler/qmlprofilertreeview.cpp | 2 +-
.../bardescriptoreditorentrypointwidget.cpp | 2 +-
.../qnx/bardescriptoreditorentrypointwidget.h | 3 +-
.../qnx/blackberrydebugtokenreader.cpp | 2 +-
.../qnx/blackberryinstallwizardpages.cpp | 2 +-
.../qnx/blackberryndksettingswidget.cpp | 2 +-
src/plugins/qnx/qnxutils.cpp | 6 +-
src/plugins/qtsupport/exampleslistmodel.cpp | 57 +++++++++++--------
src/plugins/qtsupport/exampleslistmodel.h | 3 +
src/plugins/qtsupport/qmldumptool.cpp | 5 +-
src/plugins/qtsupport/qtoptionspage.cpp | 4 +-
.../resourceeditor/qrceditor/resourcefile.cpp | 3 -
src/plugins/texteditor/basehoverhandler.cpp | 4 +-
.../managedefinitionsdialog.cpp | 2 +-
src/plugins/texteditor/snippets/snippet.cpp | 2 +-
.../texteditor/texteditoractionhandler.cpp | 2 +-
src/plugins/todo/todooutputtreeview.cpp | 4 +-
.../valgrind/callgrind/callgrinddatamodel.cpp | 2 +-
src/plugins/valgrind/memcheckerrorview.cpp | 4 +-
tests/auto/debugger/dumpers.qbs | 1 -
tests/auto/externaltool/externaltool.qbs | 4 --
tests/auto/valgrind/valgrindautotest.qbs | 4 --
76 files changed, 202 insertions(+), 199 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index 2bf06ec6135..cc09e235ec9 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -149,7 +149,6 @@ win32-msvc* {
qt {
contains(QT, core): QT += concurrent
contains(QT, gui): QT += widgets
- DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900
}
QBSFILE = $$replace(_PRO_FILE_, \\.pro$, .qbs)
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 7993328ffae..c0c6bfcea1f 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -50,7 +50,6 @@ Project {
property stringList generalDefines: [
"QT_CREATOR",
'IDE_LIBRARY_BASENAME="' + libDirName + '"',
- "QT_DISABLE_DEPRECATED_BEFORE=0x040900",
"QT_NO_CAST_TO_ASCII",
"QT_NO_CAST_FROM_ASCII"
].concat(testsEnabled ? ["WITH_TESTS"] : [])
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
index 77920210493..e27079ba155 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
@@ -21,6 +21,7 @@ include (../types/types.pri)
SOURCES += $$PWD/qmlpuppetmain.cpp
RESOURCES += $$PWD/../qmlpuppet.qrc
DEFINES -= QT_NO_CAST_FROM_ASCII
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900 # For deprecated QWeakPointer use.
unix:!macx:LIBS += -lrt # posix shared memory
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro
index 9427be64162..ed04f683cb4 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro
@@ -7,8 +7,4 @@ build_all:!build_pass {
CONFIG += release
}
-greaterThan(QT_MAJOR_VERSION, 4) {
- DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900
-}
-
include(qmlpuppet.pri)
diff --git a/src/app/main.cpp b/src/app/main.cpp
index a0875845556..73703551a44 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -53,8 +53,8 @@
#include <QNetworkProxyFactory>
#include <QApplication>
-#include <QDesktopServices>
#include <QMessageBox>
+#include <QStandardPaths>
#ifdef ENABLE_QT_BREAKPAD
#include <qtsystemexceptionhandler.h>
@@ -214,7 +214,8 @@ static inline QStringList getPluginPaths()
// "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later
// "$XDG_DATA_HOME/data/QtProject/qtcreator" or "~/.local/share/data/QtProject/qtcreator" on Linux
// "~/Library/Application Support/QtProject/Qt Creator" on Mac
- pluginPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+ pluginPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
+ + QLatin1String("/data");
pluginPath += QLatin1Char('/')
+ QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR)
+ QLatin1Char('/');
@@ -297,11 +298,6 @@ int main(int argc, char **argv)
setrlimit(RLIMIT_NOFILE, &rl);
#endif
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
- // QML is unusable with the xlib backend
- QApplication::setGraphicsSystem(QLatin1String("raster"));
-#endif
-
SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);
const int threadCount = QThreadPool::globalInstance()->maxThreadCount();
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index f2ef4744a42..3a1578eedd9 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -101,8 +101,8 @@ PluginView::PluginView(QWidget *parent)
gridLayout->addWidget(m_categoryWidget, 1, 0, 1, 1);
QHeaderView *header = m_categoryWidget->header();
- header->setResizeMode(0, QHeaderView::ResizeToContents);
- header->setResizeMode(2, QHeaderView::ResizeToContents);
+ header->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+ header->setSectionResizeMode(2, QHeaderView::ResizeToContents);
m_okIcon = QIcon(QLatin1String(":/extensionsystem/images/ok.png"));
m_errorIcon = QIcon(QLatin1String(":/extensionsystem/images/error.png"));
diff --git a/src/libs/ssh/sshkeycreationdialog.cpp b/src/libs/ssh/sshkeycreationdialog.cpp
index 0c5d3625250..ce3dd6b23d3 100644
--- a/src/libs/ssh/sshkeycreationdialog.cpp
+++ b/src/libs/ssh/sshkeycreationdialog.cpp
@@ -36,8 +36,8 @@
#include <QFileDialog>
#include <QFileInfo>
#include <QApplication>
-#include <QDesktopServices>
#include <QMessageBox>
+#include <QStandardPaths>
namespace QSsh {
@@ -51,7 +51,7 @@ SshKeyCreationDialog::SshKeyCreationDialog(QWidget *parent)
#else
m_ui->privateKeyFileButton->setText(tr("Browse..."));
#endif
- const QString defaultPath = QDesktopServices::storageLocation(QDesktopServices::HomeLocation)
+ const QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation)
+ QLatin1String("/.ssh/qtc_id");
setPrivateKeyFile(defaultPath);
diff --git a/src/libs/utils/basetreeview.cpp b/src/libs/utils/basetreeview.cpp
index 088e5dc9aeb..922787508d1 100644
--- a/src/libs/utils/basetreeview.cpp
+++ b/src/libs/utils/basetreeview.cpp
@@ -247,7 +247,7 @@ BaseTreeView::BaseTreeView(QWidget *parent)
QHeaderView *h = header();
h->setDefaultAlignment(Qt::AlignLeft);
- h->setClickable(true);
+ h->setSectionsClickable(true);
h->viewport()->installEventFilter(d);
connect(this, SIGNAL(activated(QModelIndex)),
diff --git a/src/libs/utils/environmentmodel.cpp b/src/libs/utils/environmentmodel.cpp
index 6d00b6ce910..2edb4017f80 100644
--- a/src/libs/utils/environmentmodel.cpp
+++ b/src/libs/utils/environmentmodel.cpp
@@ -32,7 +32,7 @@
#include <utils/environment.h>
#include <utils/hostosinfo.h>
-#include <QTextDocument> // Qt::escape() in Qt 4
+#include <QString>
#include <QFont>
namespace Utils {
@@ -151,7 +151,7 @@ QVariant EnvironmentModel::data(const QModelIndex &index, int role) const
QString value = d->m_resultEnvironment.value(d->m_resultEnvironment.constBegin() + index.row());
if (role == Qt::ToolTipRole && value.length() > 80) {
// Use html to enable text wrapping
- value = Qt::escape(value);
+ value = value.toHtmlEscaped();
value.prepend(QLatin1String("<html><body>"));
value.append(QLatin1String("</body></html>"));
}
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index bc9ced6c31a..4ced23e6ac8 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -42,16 +42,14 @@ static inline QString msgCanceled(const QString &searchTerm, int numMatches, int
{
return QCoreApplication::translate("Utils::FileSearch",
"%1: canceled. %n occurrences found in %2 files.",
- 0, QCoreApplication::CodecForTr, numMatches).
- arg(searchTerm).arg(numFilesSearched);
+ 0, numMatches).arg(searchTerm).arg(numFilesSearched);
}
static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched)
{
return QCoreApplication::translate("Utils::FileSearch",
"%1: %n occurrences found in %2 files.",
- 0, QCoreApplication::CodecForTr, numMatches).
- arg(searchTerm).arg(numFilesSearched);
+ 0, numMatches).arg(searchTerm).arg(numFilesSearched);
}
namespace {
diff --git a/src/libs/utils/headerviewstretcher.cpp b/src/libs/utils/headerviewstretcher.cpp
index 71294980417..e659ca6b984 100644
--- a/src/libs/utils/headerviewstretcher.cpp
+++ b/src/libs/utils/headerviewstretcher.cpp
@@ -58,14 +58,15 @@ bool HeaderViewStretcher::eventFilter(QObject *obj, QEvent *ev)
if (ev->type() == QEvent::Show) {
QHeaderView *hv = qobject_cast<QHeaderView*>(obj);
for (int i = 0; i < hv->count(); ++i)
- hv->setResizeMode(i, QHeaderView::Interactive);
+ hv->setSectionResizeMode(i, QHeaderView::Interactive);
} else if (ev->type() == QEvent::Hide) {
QHeaderView *hv = qobject_cast<QHeaderView*>(obj);
for (int i = 0; i < hv->count(); ++i)
- hv->setResizeMode(i, i == m_columnToStretch ? QHeaderView::Stretch : QHeaderView::ResizeToContents);
+ hv->setSectionResizeMode(i, i == m_columnToStretch
+ ? QHeaderView::Stretch : QHeaderView::ResizeToContents);
} else if (ev->type() == QEvent::Resize) {
QHeaderView *hv = qobject_cast<QHeaderView*>(obj);
- if (hv->resizeMode(m_columnToStretch) == QHeaderView::Interactive) {
+ if (hv->sectionResizeMode(m_columnToStretch) == QHeaderView::Interactive) {
QResizeEvent *re = static_cast<QResizeEvent*>(ev);
int diff = re->size().width() - re->oldSize().width() ;
hv->resizeSection(m_columnToStretch, qMax(32, hv->sectionSize(m_columnToStretch) + diff));
diff --git a/src/libs/utils/navigationtreeview.cpp b/src/libs/utils/navigationtreeview.cpp
index 5c91f80486d..0eb85d51dfe 100644
--- a/src/libs/utils/navigationtreeview.cpp
+++ b/src/libs/utils/navigationtreeview.cpp
@@ -60,7 +60,7 @@ NavigationTreeView::NavigationTreeView(QWidget *parent)
setHeaderHidden(true);
// We let the column adjust to contents, but note
// the setting of a minimum size in resizeEvent()
- header()->setResizeMode(QHeaderView::ResizeToContents);
+ header()->setSectionResizeMode(QHeaderView::ResizeToContents);
header()->setStretchLastSection(false);
}
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 5966dac7e2e..61c79673b0d 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -37,10 +37,10 @@
#include "hostosinfo.h"
#include <QDebug>
-#include <QDesktopServices>
#include <QFileDialog>
#include <QHBoxLayout>
#include <QPushButton>
+#include <QStandardPaths>
/*!
\class Utils::PathChooser
@@ -594,7 +594,7 @@ QString PathChooser::homePath()
// does not let people actually display the contents of their home
// directory. Alternatively, create a QtCreator-specific directory?
if (HostOsInfo::isWindowsHost())
- return QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+ return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
return QDir::homePath();
}
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index d50f91006de..6ae985ffe00 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -169,8 +169,8 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
m_ui->CreateKitCheckBox->setChecked(m_androidConfig.automaticKitCreation());
m_ui->AVDTableView->setModel(&m_AVDModel);
m_AVDModel.setAvdList(m_androidConfig.androidVirtualDevices());
- m_ui->AVDTableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
- m_ui->AVDTableView->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents);
+ m_ui->AVDTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+ m_ui->AVDTableView->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
m_ui->downloadAntToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost());
m_ui->downloadOpenJDKToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost());
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
index 619e37868de..875f19df2f0 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
@@ -207,7 +207,7 @@ void ArtisticStyleSettings::createDocumentationFile() const
const QString text = QLatin1String("<p><span class=\"option\">")
+ keys.filter(QRegExp(QLatin1String("^\\-"))).join(QLatin1String(", "))
+ QLatin1String("</span></p><p>")
- + Qt::escape(docu.join(QLatin1Char(' ')))
+ + (docu.join(QLatin1Char(' ')).toHtmlEscaped())
+ QLatin1String("</p>");
stream.writeTextElement(QLatin1String(Constants::DOCUMENTATION_XMLDOC), text);
stream.writeEndElement();
diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
index c1453519ae3..b41e2ebafcc 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
@@ -153,7 +153,7 @@ void UncrustifySettings::createDocumentationFile() const
const QString text = QLatin1String("<p><span class=\"option\">") + keyword
+ QLatin1String("</span> <span class=\"param\">") + options
+ QLatin1String("</span></p><p>")
- + Qt::escape(docu.join(QLatin1Char(' ')))
+ + (docu.join(QLatin1Char(' ')).toHtmlEscaped())
+ QLatin1String("</p>");
stream.writeStartElement(QLatin1String(Constants::DOCUMENTATION_XMLENTRY));
stream.writeTextElement(QLatin1String(Constants::DOCUMENTATION_XMLKEY), keyword);
diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index 412b7f2ee89..96d2da62c28 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -311,11 +311,11 @@ QString ClangFunctionHintModel::text(int index) const
const int end = overview.markedArgumentEnd();
QString hintText;
- hintText += Qt::escape(prettyMethod.left(begin));
+ hintText += prettyMethod.left(begin).toHtmlEscaped());
hintText += "<b>";
- hintText += Qt::escape(prettyMethod.mid(begin, end - begin));
+ hintText += prettyMethod.mid(begin, end - begin).toHtmlEscaped());
hintText += "</b>";
- hintText += Qt::escape(prettyMethod.mid(end));
+ hintText += prettyMethod.mid(end).toHtmlEscaped());
return hintText;
#endif
return m_functionSymbols.at(index).hint();
diff --git a/src/plugins/clangcodemodel/completionproposalsbuilder.cpp b/src/plugins/clangcodemodel/completionproposalsbuilder.cpp
index ac388f03272..021e1b1c1a0 100644
--- a/src/plugins/clangcodemodel/completionproposalsbuilder.cpp
+++ b/src/plugins/clangcodemodel/completionproposalsbuilder.cpp
@@ -91,7 +91,7 @@ void CompletionProposalsBuilder::operator ()(const CXCompletionResult &cxResult)
#if defined(CINDEX_VERSION) && (CINDEX_VERSION > 5)
const QString brief = Internal::getQString(clang_getCompletionBriefComment(cxResult.CompletionString));
if (!brief.isEmpty())
- m_comment += QLatin1String("<b>Brief:</b> ") + Qt::escape(brief);
+ m_comment += (QLatin1String("<b>Brief:</b> ") + brief).toHtmlEscaped();
#endif
if (m_resultAvailability == CodeCompletionResult::Deprecated) {
@@ -384,12 +384,12 @@ void CompletionProposalsBuilder::concatChunksForObjectiveCMessage(const CXComple
const QString text = Internal::getQString(clang_getCompletionChunkText(cxString, index), false);
if (chunkKind == CXCompletionChunk_ResultType) {
hintPrefix += QLatin1String("(");
- hintPrefix += Qt::escape(text);
+ hintPrefix += text.toHtmlEscaped();
hintPrefix += QLatin1String(") ");
indentBonus += 3 + text.length();
addSpaceAtPrefixEnd = false;
} else {
- hintPrefix += Qt::escape(text);
+ hintPrefix += text.toHtmlEscaped();
indentBonus += text.length();
m_snippet += text;
}
@@ -426,12 +426,12 @@ void CompletionProposalsBuilder::concatChunksForObjectiveCMessage(const CXComple
case CXCompletionChunk_Comma:
case CXCompletionChunk_HorizontalSpace:
m_snippet += text;
- parts.back().text += Qt::escape(text);
+ parts.back().text += text.toHtmlEscaped();
break;
case CXCompletionChunk_Placeholder:
appendSnippet(text);
parts.back().text += QLatin1String("<b>");
- parts.back().text += Qt::escape(text);
+ parts.back().text += text.toHtmlEscaped();
parts.back().text += QLatin1String("</b>");
break;
case CXCompletionChunk_LeftAngle:
@@ -487,7 +487,7 @@ void CompletionProposalsBuilder::concatChunksForNestedName(const CXCompletionStr
case CXCompletionChunk_Comma:
case CXCompletionChunk_HorizontalSpace:
m_snippet += text;
- m_hint += Qt::escape(text);
+ m_hint += text.toHtmlEscaped();
break;
case CXCompletionChunk_Placeholder:
@@ -575,7 +575,7 @@ void CompletionProposalsBuilder::concatChunksOnlyTypedText(const CXCompletionStr
case CXCompletionChunk_Text:
case CXCompletionChunk_LeftAngle:
case CXCompletionChunk_RightAngle:
- m_hint += Qt::escape(text);
+ m_hint += text.toHtmlEscaped();
break;
case CXCompletionChunk_HorizontalSpace:
@@ -583,14 +583,14 @@ void CompletionProposalsBuilder::concatChunksOnlyTypedText(const CXCompletionStr
if (isInsideTemplateSpec) {
m_snippet += text;
}
- m_hint += Qt::escape(text);
+ m_hint += text.toHtmlEscaped();
break;
case CXCompletionChunk_Placeholder:
if (isInsideTemplateSpec) {
appendSnippet(text);
}
- m_hint += Qt::escape(text);
+ m_hint += text.toHtmlEscaped();
break;
case CXCompletionChunk_TypedText:
@@ -599,7 +599,7 @@ void CompletionProposalsBuilder::concatChunksOnlyTypedText(const CXCompletionStr
break;
case CXCompletionChunk_ResultType: {
- m_hint += Qt::escape(text);
+ m_hint += text.toHtmlEscaped();
QChar last = text[text.size() - 1];
if (last != QLatin1Char('*') && last != QLatin1Char('&'))
m_hint += QLatin1Char(' ');
@@ -698,7 +698,7 @@ void CompletionProposalsBuilder::appendOptionalChunks(const CXCompletionString &
switch (chunkKind) {
case CXCompletionChunk_Placeholder:
- chunk.hint += Qt::escape(text);
+ chunk.hint += text.toHtmlEscaped();
break;
case CXCompletionChunk_Comma:
@@ -742,7 +742,7 @@ void CompletionProposalsBuilder::appendSnippet(const QString &text)
void CompletionProposalsBuilder::appendHintBold(const QString &text)
{
m_hint += QLatin1String("<b>");
- m_hint += Qt::escape(text);
+ m_hint += text.toHtmlEscaped();
m_hint += QLatin1String("</b>");
}
diff --git a/src/plugins/clangcodemodel/test/clangcompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcompletion_test.cpp
index e5c1c3aec1f..86fb51ef23e 100644
--- a/src/plugins/clangcodemodel/test/clangcompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcompletion_test.cpp
@@ -187,10 +187,10 @@ void ClangCodeModelPlugin::test_CXX_snippets()
if (ccr.text() != text)
continue;
hasText = true;
- QVERIFY2(snippet == ccr.snippet(), snippetError.arg(ccr.snippet()).toAscii());
+ QVERIFY2(snippet == ccr.snippet(), snippetError.arg(ccr.snippet()).toLatin1());
}
const QString textError(QLatin1String("Text not found:") + text);
- QVERIFY2(hasText, textError.toAscii());
+ QVERIFY2(hasText, textError.toLatin1());
}
}
@@ -298,12 +298,12 @@ void ClangCodeModelPlugin::test_ObjC_hints()
if (ccr.text() != text)
continue;
hasText = true;
- QVERIFY2(snippet == ccr.snippet(), snippetError.arg(ccr.snippet()).toAscii());
- QVERIFY2(hint == ccr.hint(), hintError.arg(ccr.hint()).toAscii());
+ QVERIFY2(snippet == ccr.snippet(), snippetError.arg(ccr.snippet()).toLatin1());
+ QVERIFY2(hint == ccr.hint(), hintError.arg(ccr.hint()).toLatin1());
}
const QString textError(QString::fromLatin1("Text \"%1\" not found in set %2")
.arg(text).arg(texts.join(QLatin1Char(','))));
- QVERIFY2(hasText, textError.toAscii());
+ QVERIFY2(hasText, textError.toLatin1());
}
}
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp
index 2f55486c5ee..2550efee882 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp
@@ -209,7 +209,7 @@ void CMakeTool::parseFunctionOutput(const QByteArray &output)
QString CMakeTool::formatFunctionDetails(const QString &command, const QString &args)
{
return QString::fromLatin1("<table><tr><td><b>%1</b></td><td>%2</td></tr>")
- .arg(Qt::escape(command)).arg(Qt::escape(args));
+ .arg(command.toHtmlEscaped(), args.toHtmlEscaped());
}
void CMakeTool::parseFunctionDetailsOutput(const QByteArray &output)
@@ -250,7 +250,7 @@ void CMakeTool::parseFunctionDetailsOutput(const QByteArray &output)
} else {
extractKeywords(lineTrimmed, &m_variables);
currentCommandSyntax += QString::fromLatin1("<tr><td> </td><td>%1</td></tr>")
- .arg(Qt::escape(QString::fromLocal8Bit(lineTrimmed)));
+ .arg(QString::fromLocal8Bit(lineTrimmed).toHtmlEscaped());
}
}
}
diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
index fa3353159d3..1077e4b5b31 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
@@ -57,7 +57,6 @@ static const Qt::ItemFlags TOOL_ITEM_FLAGS = Qt::ItemIsSelectable | Qt::ItemIsEn
ExternalToolModel::ExternalToolModel(QObject *parent)
: QAbstractItemModel(parent)
{
- setSupportedDragActions(Qt::MoveAction);
}
ExternalToolModel::~ExternalToolModel()
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index d683fde5a5f..7c77dcf37c7 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -103,8 +103,8 @@ OpenEditorsWidget::OpenEditorsWidget()
setSelectionBehavior(QAbstractItemView::SelectRows);
setActivationMode(Utils::SingleClickActivation);
header()->setStretchLastSection(false);
- header()->setResizeMode(0, QHeaderView::Stretch);
- header()->setResizeMode(1, QHeaderView::Fixed);
+ header()->setSectionResizeMode(0, QHeaderView::Stretch);
+ header()->setSectionResizeMode(1, QHeaderView::Fixed);
header()->resizeSection(1, 16);
setContextMenuPolicy(Qt::CustomContextMenu);
installEventFilter(this);
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index 5aa9ca232f7..b9c68433f5a 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -316,7 +316,7 @@ static void localizedText(const QStringList &locales, QXmlStreamReader *reader,
if (*currentLocale < 0 && currentText->isEmpty()) {
*currentText = QCoreApplication::translate("Core::Internal::ExternalTool",
reader->readElementText().toUtf8().constData(),
- "", QCoreApplication::UnicodeUTF8);
+ "");
} else {
reader->skipCurrentElement();
}
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index 161819f4ad8..326c6af0776 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -198,7 +198,7 @@ CompletionList::CompletionList(QWidget *parent)
header()->hide();
header()->setStretchLastSection(true);
// This is too slow when done on all results
- //header()->setResizeMode(QHeaderView::ResizeToContents);
+ //header()->setSectionResizeMode(QHeaderView::ResizeToContents);
setWindowFlags(Qt::ToolTip);
if (Utils::HostOsInfo::isMacHost()) {
if (horizontalScrollBar())
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index c65f8e5387a..d53bb041799 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -99,7 +99,7 @@ void CppHoverHandler::identifyMatch(TextEditor::BaseTextEditor *editor, int pos)
void CppHoverHandler::decorateToolTip()
{
if (Qt::mightBeRichText(toolTip()))
- setToolTip(Qt::escape(toolTip()));
+ setToolTip(toolTip().toHtmlEscaped());
if (isDiagnosticTooltip())
return;
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 6f1001e1914..a0a2e2b0556 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -375,11 +375,11 @@ QString CppFunctionHintModel::text(int index) const
const int end = overview.markedArgumentEnd;
QString hintText;
- hintText += Qt::escape(prettyMethod.left(begin));
+ hintText += prettyMethod.left(begin).toHtmlEscaped();
hintText += QLatin1String("<b>");
- hintText += Qt::escape(prettyMethod.mid(begin, end - begin));
+ hintText += prettyMethod.mid(begin, end - begin).toHtmlEscaped();
hintText += QLatin1String("</b>");
- hintText += Qt::escape(prettyMethod.mid(end));
+ hintText += prettyMethod.mid(end).toHtmlEscaped();
return hintText;
}
diff --git a/src/plugins/debugger/debuggeroptionspage.cpp b/src/plugins/debugger/debuggeroptionspage.cpp
index e7cb80c7c4b..4215620a060 100644
--- a/src/plugins/debugger/debuggeroptionspage.cpp
+++ b/src/plugins/debugger/debuggeroptionspage.cpp
@@ -249,9 +249,9 @@ QWidget *DebuggerOptionsPage::widget()
QHeaderView *header = m_debuggerView->header();
header->setStretchLastSection(false);
- header->setResizeMode(0, QHeaderView::ResizeToContents);
- header->setResizeMode(1, QHeaderView::ResizeToContents);
- header->setResizeMode(2, QHeaderView::Stretch);
+ header->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+ header->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+ header->setSectionResizeMode(2, QHeaderView::Stretch);
QVBoxLayout *buttonLayout = new QVBoxLayout();
buttonLayout->setSpacing(6);
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
index 6780d80e19f..2a05fa7994a 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
@@ -444,9 +444,9 @@ void QScriptDebuggerClient::messageReceived(const QByteArray &data)
QString msg = stackFrames.isEmpty()
? tr("<p>An uncaught exception occurred:</p><p>%1</p>")
- .arg(Qt::escape(error))
+ .arg(error.toHtmlEscaped())
: tr("<p>An uncaught exception occurred in \"%1\":</p><p>%2</p>")
- .arg(QLatin1String(stackFrames.value(0).fileUrl), Qt::escape(error));
+ .arg(QLatin1String(stackFrames.value(0).fileUrl), error.toHtmlEscaped());
showMessageBox(QMessageBox::Information, tr("Uncaught Exception"), msg);
} else {
QString file;
diff --git a/src/plugins/debugger/sourcefileshandler.cpp b/src/plugins/debugger/sourcefileshandler.cpp
index 7fd5ea60e84..9e7029b77aa 100644
--- a/src/plugins/debugger/sourcefileshandler.cpp
+++ b/src/plugins/debugger/sourcefileshandler.cpp
@@ -118,7 +118,7 @@ void SourceFilesHandler::setSourceFiles(const QMap<QString, QString> &sourceFile
void SourceFilesHandler::removeAll()
{
setSourceFiles(QMap<QString, QString>());
- //header()->setResizeMode(0, QHeaderView::ResizeToContents);
+ //header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
}
} // namespace Internal
diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp
index dc6ccfdb36e..dd4921e7d0f 100644
--- a/src/plugins/debugger/watchdata.cpp
+++ b/src/plugins/debugger/watchdata.cpp
@@ -341,36 +341,11 @@ QString WatchData::toString() const
return res + QLatin1Char('}');
}
-static QString htmlEscape(const QString &plain)
-{
-#if QT_VERSION >= 0x050000
- return Qt::escape(plain);
-#else
- // Copied from Qt to avoid GUI dependency
- // (Qt::escape has been moved in Qt 5)
- QString rich;
- rich.reserve(int(plain.length() * qreal(1.1)));
- for (int i = 0; i < plain.length(); ++i) {
- if (plain.at(i) == QLatin1Char('<'))
- rich += QLatin1String("<");
- else if (plain.at(i) == QLatin1Char('>'))
- rich += QLatin1String(">");
- else if (plain.at(i) == QLatin1Char('&'))
- rich += QLatin1String("&");
- else if (plain.at(i) == QLatin1Char('"'))
- rich += QLatin1String(""");
- else
- rich += plain.at(i);
- }
- return rich;
-#endif
-}
-
// Format a tooltip fow with aligned colon.
static void formatToolTipRow(QTextStream &str,
const QString &category, const QString &value)
{
- QString val = htmlEscape(value);
+ QString val = value.toHtmlEscaped();
val.replace(QLatin1Char('\n'), QLatin1String("<br>"));
str << "<tr><td>" << category << "</td><td> : </td><td>"
<< val << "</td></tr>";
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index f2478d036f4..4c83d5a0771 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -51,6 +51,7 @@
#include <QTabWidget>
#include <QTextEdit>
+#include <cstring>
#include <ctype.h>
//#define USE_WATCH_MODEL_TEST 0
@@ -1845,7 +1846,7 @@ void WatchHandler::showEditValue(const WatchData &data)
QTC_ASSERT(0 < nbytes && nbytes < 10000 * 10000, return);
QTC_ASSERT(0 < format && format < 32, return);
QImage im(width, height, QImage::Format(format));
- qMemCopy(im.bits(), bits, nbytes);
+ std::memcpy(im.bits(), bits, nbytes);
const QString title = data.address ?
tr("%1 Object at %2").arg(QLatin1String(data.type),
QLatin1String(data.hexAddress())) :
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index c39a4587f81..0ef2b92feb4 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -97,10 +97,10 @@
#include <QStackedWidget>
#include <QTextStream>
-#include <QDesktopServices>
#include <QItemDelegate>
#include <QPlainTextEdit>
#include <QShortcut>
+#include <QStandardPaths>
#include <QTextBlock>
#include <QTextCursor>
#include <QTextEdit>
@@ -1379,7 +1379,7 @@ void FakeVimPluginPrivate::maybeReadVimRc()
return;
QString fileName = theFakeVimSetting(ConfigVimRcPath)->value().toString();
if (fileName.isEmpty()) {
- fileName = QDesktopServices::storageLocation(QDesktopServices::HomeLocation)
+ fileName = QStandardPaths::writableLocation(QStandardPaths::HomeLocation)
+ (Utils::HostOsInfo::isWindowsHost() ? _("/_vimrc") : _("/.vimrc"));
}
//qDebug() << "READING VIMRC: " << fileName;
diff --git a/src/plugins/git/gitorious/gitorious.cpp b/src/plugins/git/gitorious/gitorious.cpp
index adb688c14c1..4c010698b37 100644
--- a/src/plugins/git/gitorious/gitorious.cpp
+++ b/src/plugins/git/gitorious/gitorious.cpp
@@ -34,6 +34,7 @@
#include <QSettings>
#include <QNetworkReply>
+#include <QUrlQuery>
#include <utils/qtcassert.h>
#include <utils/networkaccessmanager.h>
@@ -544,9 +545,11 @@ void Gitorious::updateProjectList(int hostIndex)
void Gitorious::startProjectsRequest(int hostIndex, int page)
{
QUrl url = httpRequest(hostName(hostIndex), QLatin1String("projects"));
- url.addQueryItem(QLatin1String("format"), QLatin1String("xml"));
+ QUrlQuery query;
+ query.addQueryItem(QLatin1String("format"), QLatin1String("xml"));
if (page >= 0)
- url.addQueryItem(QLatin1String("page"), QString::number(page));
+ query.addQueryItem(QLatin1String("page"), QString::number(page));
+ url.setQuery(query);
createRequest(url, ListProjectsProtocol, hostIndex, page);
}
diff --git a/src/plugins/glsleditor/glslhoverhandler.cpp b/src/plugins/glsleditor/glslhoverhandler.cpp
index ef2232fa3ce..1c60ce07c9b 100644
--- a/src/plugins/glsleditor/glslhoverhandler.cpp
+++ b/src/plugins/glsleditor/glslhoverhandler.cpp
@@ -62,7 +62,7 @@ void GlslHoverHandler::identifyMatch(TextEditor::BaseTextEditor *editor, int pos
void GlslHoverHandler::decorateToolTip()
{
if (Qt::mightBeRichText(toolTip()))
- setToolTip(Qt::escape(toolTip()));
+ setToolTip(toolTip().toHtmlEscaped());
}
} // namespace Internal
diff --git a/src/plugins/help/openpageswidget.cpp b/src/plugins/help/openpageswidget.cpp
index a73c48e1ba4..0f9a2a0517a 100644
--- a/src/plugins/help/openpageswidget.cpp
+++ b/src/plugins/help/openpageswidget.cpp
@@ -98,8 +98,8 @@ OpenPagesWidget::OpenPagesWidget(OpenPagesModel *model, QWidget *parent)
header()->hide();
header()->setStretchLastSection(false);
- header()->setResizeMode(0, QHeaderView::Stretch);
- header()->setResizeMode(1, QHeaderView::Fixed);
+ header()->setSectionResizeMode(0, QHeaderView::Stretch);
+ header()->setSectionResizeMode(1, QHeaderView::Fixed);
header()->resizeSection(1, 18);
installEventFilter(this);
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index 142974335d5..53c1485ddff 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -36,7 +36,7 @@
#include <utils/qtcassert.h>
#include <QCoreApplication>
-#include <QDesktopServices>
+#include <QStandardPaths>
#include <QString>
#include <QUuid>
@@ -417,7 +417,7 @@ int IDevice::version() const
QString IDevice::defaultPrivateKeyFilePath()
{
- return QDesktopServices::storageLocation(QDesktopServices::HomeLocation)
+ return QStandardPaths::writableLocation(QStandardPaths::HomeLocation)
+ QLatin1String("/.ssh/id_rsa");
}
diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp
index 0ea12983d30..799f729063a 100644
--- a/src/plugins/projectexplorer/environmentwidget.cpp
+++ b/src/plugins/projectexplorer/environmentwidget.cpp
@@ -205,9 +205,9 @@ void EnvironmentWidget::updateSummaryText()
if (item.name != Utils::EnvironmentModel::tr("<VARIABLE>")) {
text.append(QLatin1String("<br>"));
if (item.unset)
- text.append(tr("Unset <a href=\"%1\"><b>%1</b></a>").arg(Qt::escape(item.name)));
+ text.append(tr("Unset <a href=\"%1\"><b>%1</b></a>").arg(item.name.toHtmlEscaped()));
else
- text.append(tr("Set <a href=\"%1\"><b>%1</b></a> to <b>%2</b>").arg(Qt::escape(item.name), Qt::escape(item.value)));
+ text.append(tr("Set <a href=\"%1\"><b>%1</b></a> to <b>%2</b>").arg(item.name.toHtmlEscaped(), item.value.toHtmlEscaped()));
}
}
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index c130107280d..75975b7a364 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -442,7 +442,7 @@ ToolChain::CompilerFlags GccToolChain::compilerFlags(const QStringList &cxxflags
const QStringList allCxxflags = m_platformCodeGenFlags + cxxflags; // add only cxxflags is empty?
foreach (const QString &flag, allCxxflags) {
if (flag.startsWith(QLatin1String("-std="))) {
- const QByteArray std = flag.mid(5).toAscii();
+ const QByteArray std = flag.mid(5).toLatin1();
if (std == "c++98" || std == "c++03") {
flags &= ~CompilerFlags(StandardCxx11 | GnuExtensions);
} else if (std == "gnu++98" || std == "gnu++03") {
diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp
index 4e81d40ca81..3f96f43a55c 100644
--- a/src/plugins/projectexplorer/kitoptionspage.cpp
+++ b/src/plugins/projectexplorer/kitoptionspage.cpp
@@ -97,7 +97,7 @@ QWidget *KitOptionsPage::widget()
verticalLayout->setStretch(1, 0);
m_kitsView->setModel(m_model);
- m_kitsView->header()->setResizeMode(0, QHeaderView::Stretch);
+ m_kitsView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
m_kitsView->expandAll();
m_selectionModel = m_kitsView->selectionModel();
diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp
index 7bb245deeae..c7185461dfd 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepage.cpp
@@ -50,14 +50,6 @@ namespace Internal {
SessionModel::SessionModel(QObject *parent)
: QAbstractListModel(parent)
{
- QHash<int, QByteArray> roleNames;
- roleNames[Qt::DisplayRole] = "sessionName";
- roleNames[DefaultSessionRole] = "defaultSession";
- roleNames[ActiveSessionRole] = "activeSession";
- roleNames[LastSessionRole] = "lastSession";
- roleNames[ProjectsPathRole] = "projectsPath";
- roleNames[ProjectsDisplayRole] = "projectsName";
- setRoleNames(roleNames);
connect(SessionManager::instance(), SIGNAL(sessionLoaded(QString)), SLOT(resetSessions()));
}
@@ -103,6 +95,18 @@ QVariant SessionModel::data(const QModelIndex &index, int role) const
return QVariant();
}
+QHash<int, QByteArray> SessionModel::roleNames() const
+{
+ QHash<int, QByteArray> roleNames;
+ roleNames[Qt::DisplayRole] = "sessionName";
+ roleNames[DefaultSessionRole] = "defaultSession";
+ roleNames[ActiveSessionRole] = "activeSession";
+ roleNames[LastSessionRole] = "lastSession";
+ roleNames[ProjectsPathRole] = "projectsPath";
+ roleNames[ProjectsDisplayRole] = "projectsName";
+ return roleNames;
+}
+
bool SessionModel::isDefaultVirgin() const
{
return SessionManager::isDefaultVirgin();
@@ -164,11 +168,6 @@ void SessionModel::renameSession(const QString &session)
ProjectModel::ProjectModel(ProjectExplorerPlugin *plugin, QObject *parent)
: QAbstractListModel(parent), m_plugin(plugin)
{
- QHash<int, QByteArray> roleNames;
- roleNames[Qt::DisplayRole] = "displayName";
- roleNames[FilePathRole] = "filePath";
- roleNames[PrettyFilePathRole] = "prettyFilePath";
- setRoleNames(roleNames);
connect(plugin, SIGNAL(recentProjectsChanged()), SLOT(resetProjects()));
}
@@ -195,6 +194,15 @@ QVariant ProjectModel::data(const QModelIndex &index, int role) const
return QVariant();
}
+QHash<int, QByteArray> ProjectModel::roleNames() const
+{
+ QHash<int, QByteArray> roleNames;
+ roleNames[Qt::DisplayRole] = "displayName";
+ roleNames[FilePathRole] = "filePath";
+ roleNames[PrettyFilePathRole] = "prettyFilePath";
+ return roleNames;
+}
+
void ProjectModel::resetProjects()
{
beginResetModel();
diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h
index 0d332f084f3..51afdbfbcf8 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.h
+++ b/src/plugins/projectexplorer/projectwelcomepage.h
@@ -53,6 +53,7 @@ public:
explicit SessionModel(QObject *parent = 0);
int rowCount(const QModelIndex &parent) const;
QVariant data(const QModelIndex &index, int role) const;
+ QHash<int, QByteArray> roleNames() const;
Q_SCRIPTABLE bool isDefaultVirgin() const;
@@ -73,6 +74,7 @@ public:
ProjectModel(ProjectExplorerPlugin* plugin, QObject* parent = 0);
int rowCount(const QModelIndex &parent) const;
QVariant data(const QModelIndex &index, int role) const;
+ QHash<int, QByteArray> roleNames() const;
public slots:
void resetProjects();
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index c2f3ca8ee4d..4ddd1f4f4f3 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -487,8 +487,8 @@ QWidget *ToolChainOptionsPage::widget()
connect(m_model, SIGNAL(toolChainStateChanged()), this, SLOT(updateState()));
m_toolChainView->setModel(m_model);
- m_toolChainView->header()->setResizeMode(0, QHeaderView::ResizeToContents);
- m_toolChainView->header()->setResizeMode(1, QHeaderView::Stretch);
+ m_toolChainView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+ m_toolChainView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
m_toolChainView->expandAll();
m_selectionModel = m_toolChainView->selectionModel();
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index bc6bf236826..43bab012d53 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -103,6 +103,11 @@ QVariant ItemLibraryModel::data(const QModelIndex &index, int role) const
return QVariant();
}
+QHash<int, QByteArray> ItemLibraryModel::roleNames() const
+{
+ return m_roleNames;
+}
+
QString ItemLibraryModel::searchText() const
{
return m_searchText;
@@ -242,8 +247,6 @@ void ItemLibraryModel::addRoleNames()
m_roleNames.insert(role, property.name());
++role;
}
-
- setRoleNames(m_roleNames);
}
void ItemLibraryModel::resetModel()
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index 063f70b95ac..451872a57f8 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -55,6 +55,7 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ QHash<int, QByteArray> roleNames() const;
QString searchText() const;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp
index 430bf69d8eb..10c81865681 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp
@@ -70,6 +70,11 @@ QVariant ItemLibrarySectionModel::data(const QModelIndex &index, int role) const
return QVariant();
}
+QHash<int, QByteArray> ItemLibrarySectionModel::roleNames() const
+{
+ return m_roleNames;
+}
+
void ItemLibrarySectionModel::clearItems()
{
beginResetModel();
@@ -111,8 +116,6 @@ void ItemLibrarySectionModel::addRoleNames()
m_roleNames.insert(role, property.name());
++role;
}
-
- setRoleNames(m_roleNames);
}
} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h
index e38fffc95fe..e28816e6f50 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h
@@ -48,6 +48,7 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ QHash<int, QByteArray> roleNames() const;
void clearItems();
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index 91b2c657cd8..6b982e9da14 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -113,8 +113,6 @@ NavigatorTreeModel::NavigatorTreeModel(QObject *parent)
setColumnCount(2);
# endif
- setSupportedDragActions(Qt::LinkAction);
-
connect(this, SIGNAL(itemChanged(QStandardItem*)),
this, SLOT(handleChangedItem(QStandardItem*)));
}
@@ -128,6 +126,11 @@ Qt::DropActions NavigatorTreeModel::supportedDropActions() const
return Qt::LinkAction | Qt::MoveAction;
}
+Qt::DropActions NavigatorTreeModel::supportedDragActions() const
+{
+ return Qt::LinkAction;
+}
+
QStringList NavigatorTreeModel::mimeTypes() const
{
QStringList types;
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h
index 0c19a803e1d..532ab5e846c 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h
@@ -90,6 +90,7 @@ public:
~NavigatorTreeModel();
Qt::DropActions supportedDropActions() const;
+ Qt::DropActions supportedDragActions() const;
QStringList mimeTypes() const;
QMimeData *mimeData(const QModelIndexList &indexes) const;
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
index 24809188b51..10d2889c550 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
@@ -133,7 +133,7 @@ void NavigatorView::modelAttached(Model *model)
QTreeView *treeView = treeWidget();
treeView->expandAll();
- treeView->header()->setResizeMode(0, QHeaderView::Stretch);
+ treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
treeView->header()->resizeSection(1,26);
treeView->setRootIsDecorated(false);
treeView->setIndentation(20);
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
index e1fe464268e..12554c34b1c 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
@@ -53,11 +53,6 @@ StatesEditorModel::StatesEditorModel(StatesEditorView *view)
m_statesEditorView(view),
m_updateCounter(0)
{
- QHash<int, QByteArray> roleNames;
- roleNames.insert(StateNameRole, "stateName");
- roleNames.insert(StateImageSourceRole, "stateImageSource");
- roleNames.insert(InternalNodeId, "internalNodeId");
- setRoleNames(roleNames);
}
@@ -133,6 +128,15 @@ QVariant StatesEditorModel::data(const QModelIndex &index, int role) const
return QVariant();
}
+QHash<int, QByteArray> StatesEditorModel::roleNames() const
+{
+ QHash<int, QByteArray> roleNames;
+ roleNames.insert(StateNameRole, "stateName");
+ roleNames.insert(StateImageSourceRole, "stateImageSource");
+ roleNames.insert(InternalNodeId, "internalNodeId");
+ return roleNames;
+}
+
void StatesEditorModel::insertState(int stateIndex)
{
if (stateIndex >= 0) {
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h
index 99f08be602e..5739cf01152 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h
@@ -57,6 +57,7 @@ public:
QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ QHash<int, QByteArray> roleNames() const;
void insertState(int stateIndex);
void removeState(int stateIndex);
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index 190a8d65827..a0c72cd7d0b 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -22,6 +22,7 @@ include(components/importmanager/importmanager.pri)
include(qmldesignerplugin.pri)
DEFINES -= QT_NO_CAST_FROM_ASCII
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900 # For deprecated QWeakPointer use.
BUILD_PUPPET_IN_CREATOR_BINPATH = $$(BUILD_PUPPET_IN_CREATOR_BINPATH)
!isEmpty(BUILD_PUPPET_IN_CREATOR_BINPATH) {
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp
index badde4ef699..88b425739de 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.cpp
+++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp
@@ -306,8 +306,6 @@ QmlOutlineModel::QmlOutlineModel(QmlJSEditorDocument *document) :
const QString resourcePath = Core::ICore::resourcePath();
Icons::instance()->setIconFilesPath(resourcePath + QLatin1String("/qmlicons"));
- // TODO: Maybe add a Copy Action?
- setSupportedDragActions(Qt::MoveAction);
setItemPrototype(new QmlOutlineItem(this));
}
@@ -410,6 +408,12 @@ Qt::ItemFlags QmlOutlineModel::flags(const QModelIndex &index) const
return flags;
}
+Qt::DropActions QmlOutlineModel::supportedDragActions() const
+{
+ // TODO: Maybe add a Copy Action?
+ return Qt::MoveAction;
+}
+
Document::Ptr QmlOutlineModel::document() const
{
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h
index a127a92a494..6a58488641f 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.h
+++ b/src/plugins/qmljseditor/qmloutlinemodel.h
@@ -88,6 +88,7 @@ public:
QMimeData *mimeData(const QModelIndexList &indexes) const;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
Qt::ItemFlags flags(const QModelIndex &index) const;
+ Qt::DropActions supportedDragActions() const;
QmlJS::Document::Ptr document() const;
void update(const QmlJSTools::SemanticInfo &semanticInfo);
diff --git a/src/plugins/qmlprofiler/qmlprofilertreeview.cpp b/src/plugins/qmlprofiler/qmlprofilertreeview.cpp
index a85c168b403..2267890db16 100644
--- a/src/plugins/qmlprofiler/qmlprofilertreeview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertreeview.cpp
@@ -39,7 +39,7 @@ QmlProfilerTreeView::QmlProfilerTreeView(QWidget *parent)
: Utils::TreeView(parent)
{
setFrameStyle(QFrame::NoFrame);
- header()->setResizeMode(QHeaderView::Interactive);
+ header()->setSectionResizeMode(QHeaderView::Interactive);
header()->setDefaultSectionSize(100);
header()->setMinimumSectionSize(50);
}
diff --git a/src/plugins/qnx/bardescriptoreditorentrypointwidget.cpp b/src/plugins/qnx/bardescriptoreditorentrypointwidget.cpp
index a941dcbdfb4..a270cf1a9bb 100644
--- a/src/plugins/qnx/bardescriptoreditorentrypointwidget.cpp
+++ b/src/plugins/qnx/bardescriptoreditorentrypointwidget.cpp
@@ -90,7 +90,7 @@ BarDescriptorEditorEntryPointWidget::~BarDescriptorEditorEntryPointWidget()
void BarDescriptorEditorEntryPointWidget::setAssetsModel(QStandardItemModel *assetsModel)
{
- m_assetsModel = QWeakPointer<QStandardItemModel>(assetsModel);
+ m_assetsModel = assetsModel;
}
void BarDescriptorEditorEntryPointWidget::updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value)
diff --git a/src/plugins/qnx/bardescriptoreditorentrypointwidget.h b/src/plugins/qnx/bardescriptoreditorentrypointwidget.h
index 820b8d1d340..5b67152249c 100644
--- a/src/plugins/qnx/bardescriptoreditorentrypointwidget.h
+++ b/src/plugins/qnx/bardescriptoreditorentrypointwidget.h
@@ -34,6 +34,7 @@
#include "bardescriptoreditorabstractpanelwidget.h"
+#include <QPointer>
#include <QStandardItemModel>
QT_BEGIN_NAMESPACE
@@ -91,7 +92,7 @@ private:
QString localAssetPathFromDestination(const QString &path);
QStringListModel *m_splashScreenModel;
- QWeakPointer<QStandardItemModel> m_assetsModel;
+ QPointer<QStandardItemModel> m_assetsModel;
QString m_prevIconPath;
diff --git a/src/plugins/qnx/blackberrydebugtokenreader.cpp b/src/plugins/qnx/blackberrydebugtokenreader.cpp
index 4168e0e50b0..97e2b28fd0b 100644
--- a/src/plugins/qnx/blackberrydebugtokenreader.cpp
+++ b/src/plugins/qnx/blackberrydebugtokenreader.cpp
@@ -134,5 +134,5 @@ QString BlackBerryDebugTokenReader::value(const QByteArray &key, const QByteArra
{
int valueStart = data.indexOf(key) + key.size();
int valueEnd = data.indexOf(QByteArray("\r\n"), valueStart);
- return QString::fromAscii(data.mid(valueStart, valueEnd - valueStart));
+ return QString::fromLatin1(data.mid(valueStart, valueEnd - valueStart));
}
diff --git a/src/plugins/qnx/blackberryinstallwizardpages.cpp b/src/plugins/qnx/blackberryinstallwizardpages.cpp
index bce2ee354a8..01689cdb436 100644
--- a/src/plugins/qnx/blackberryinstallwizardpages.cpp
+++ b/src/plugins/qnx/blackberryinstallwizardpages.cpp
@@ -353,7 +353,7 @@ void BlackBerryInstallWizardTargetPage::initTargetsTreeWidget()
{
m_ui->targetsTreeWidget->clear();
m_ui->targetsTreeWidget->setHeaderHidden(false);
- m_ui->targetsTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents);
+ m_ui->targetsTreeWidget->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
m_ui->targetsTreeWidget->setHeaderItem(new QTreeWidgetItem(QStringList() << tr("Version") << tr("Name")));
m_ui->targetsTreeWidget->setTextElideMode(Qt::ElideNone);
m_ui->targetsTreeWidget->setColumnCount(2);
diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp
index ce5551469c7..222ad25d067 100644
--- a/src/plugins/qnx/blackberryndksettingswidget.cpp
+++ b/src/plugins/qnx/blackberryndksettingswidget.cpp
@@ -67,7 +67,7 @@ BlackBerryNDKSettingsWidget::BlackBerryNDKSettingsWidget(QWidget *parent) :
m_activatedApiLevel << m_bbConfigManager->activeApiLevels();
- m_ui->ndksTreeWidget->header()->setResizeMode(QHeaderView::Stretch);
+ m_ui->ndksTreeWidget->header()->setSectionResizeMode(QHeaderView::Stretch);
m_ui->ndksTreeWidget->header()->setStretchLastSection(false);
m_ui->ndksTreeWidget->setHeaderItem(new QTreeWidgetItem(QStringList() << tr("Configuration")));
m_ui->ndksTreeWidget->setTextElideMode(Qt::ElideNone);
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index 3791ecfa78a..6ca62db3e95 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -36,9 +36,9 @@
#include <utils/synchronousprocess.h>
#include <QDir>
-#include <QDesktopServices>
#include <QDomDocument>
#include <QProcess>
+#include <QStandardPaths>
#include <QTemporaryFile>
#include <QApplication>
@@ -191,9 +191,11 @@ QString QnxUtils::bbDataDirPath()
if (Utils::HostOsInfo::isWindowsHost()) {
// Get the proper storage location on Windows using QDesktopServices,
// to not hardcode "AppData/Local", as it might refer to "AppData/Roaming".
- QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+ QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
+ + QLatin1String("/data");
dataDir = dataDir.left(dataDir.indexOf(QCoreApplication::organizationName()));
dataDir.append(QLatin1String("Research in Motion"));
+ qDebug("qnx: Full data dir is '%s'", qPrintable(dataDir));
return dataDir;
}
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
index e3b946e6614..c97feb23820 100644
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -76,11 +76,6 @@ ExampleSetModel::ExampleSetModel(ExamplesListModel *examplesModel, QObject *pare
QStandardItemModel(parent),
examplesModel(examplesModel)
{
- QHash<int, QByteArray> roleNames;
- roleNames[Qt::UserRole + 1] = "text";
- roleNames[Qt::UserRole + 2] = "QtId";
- roleNames[Qt::UserRole + 3] = "extraSetIndex";
- setRoleNames(roleNames);
}
void ExampleSetModel::update()
@@ -195,31 +190,20 @@ int ExampleSetModel::getExtraExampleSetIndex(int i) const
return variant.toInt();
}
+QHash<int, QByteArray> ExampleSetModel::roleNames() const
+{
+ QHash<int, QByteArray> roleNames;
+ roleNames[Qt::UserRole + 1] = "text";
+ roleNames[Qt::UserRole + 2] = "QtId";
+ roleNames[Qt::UserRole + 3] = "extraSetIndex";
+ return roleNames;
+}
+
ExamplesListModel::ExamplesListModel(QObject *parent) :
QAbstractListModel(parent),
m_exampleSetModel(new ExampleSetModel(this, this)),
m_selectedExampleSetIndex(-1)
{
- QHash<int, QByteArray> roleNames;
- roleNames[Name] = "name";
- roleNames[ProjectPath] = "projectPath";
- roleNames[ImageUrl] = "imageUrl";
- roleNames[Description] = "description";
- roleNames[DocUrl] = "docUrl";
- roleNames[FilesToOpen] = "filesToOpen";
- roleNames[MainFile] = "mainFile";
- roleNames[Tags] = "tags";
- roleNames[Difficulty] = "difficulty";
- roleNames[Type] = "type";
- roleNames[HasSourceCode] = "hasSourceCode";
- roleNames[Dependencies] = "dependencies";
- roleNames[IsVideo] = "isVideo";
- roleNames[VideoUrl] = "videoUrl";
- roleNames[VideoLength] = "videoLength";
- roleNames[Platforms] = "platforms";
- roleNames[IsHighlighted] = "isHighlighted";
- setRoleNames(roleNames);
-
// read extra example sets settings
QSettings *settings = Core::ICore::settings();
QStringList list = settings->value(QLatin1String("Help/InstalledExamples"),
@@ -698,6 +682,29 @@ QVariant ExamplesListModel::data(const QModelIndex &index, int role) const
}
}
+QHash<int, QByteArray> ExamplesListModel::roleNames() const
+{
+ QHash<int, QByteArray> roleNames;
+ roleNames[Name] = "name";
+ roleNames[ProjectPath] = "projectPath";
+ roleNames[ImageUrl] = "imageUrl";
+ roleNames[Description] = "description";
+ roleNames[DocUrl] = "docUrl";
+ roleNames[FilesToOpen] = "filesToOpen";
+ roleNames[MainFile] = "mainFile";
+ roleNames[Tags] = "tags";
+ roleNames[Difficulty] = "difficulty";
+ roleNames[Type] = "type";
+ roleNames[HasSourceCode] = "hasSourceCode";
+ roleNames[Dependencies] = "dependencies";
+ roleNames[IsVideo] = "isVideo";
+ roleNames[VideoUrl] = "videoUrl";
+ roleNames[VideoLength] = "videoLength";
+ roleNames[Platforms] = "platforms";
+ roleNames[IsHighlighted] = "isHighlighted";
+ return roleNames;
+}
+
void ExamplesListModel::update()
{
updateQtVersions();
diff --git a/src/plugins/qtsupport/exampleslistmodel.h b/src/plugins/qtsupport/exampleslistmodel.h
index bc322373dc9..7fd34bb9c42 100644
--- a/src/plugins/qtsupport/exampleslistmodel.h
+++ b/src/plugins/qtsupport/exampleslistmodel.h
@@ -68,6 +68,8 @@ public:
int getExtraExampleSetIndex(int index) const;
private:
+ QHash<int, QByteArray> roleNames() const;
+
ExamplesListModel *examplesModel;
};
@@ -121,6 +123,7 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ QHash<int, QByteArray> roleNames() const;
void beginReset() { beginResetModel(); }
void endReset() { endResetModel(); }
diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp
index ecc74dc2347..eabb73f0dee 100644
--- a/src/plugins/qtsupport/qmldumptool.cpp
+++ b/src/plugins/qtsupport/qmldumptool.cpp
@@ -40,11 +40,12 @@
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
-#include <QDesktopServices>
+
#include <QCoreApplication>
#include <QDir>
#include <QDebug>
#include <QHash>
+#include <QStandardPaths>
namespace {
@@ -308,7 +309,7 @@ QStringList QmlDumpTool::installDirectories(const QString &qtInstallData)
directories
<< (qtInstallData + QLatin1String("/qtc-qmldump/"))
<< QDir::cleanPath((QCoreApplication::applicationDirPath() + QLatin1String("/../qtc-qmldump/") + QString::number(hash))) + slash
- << (QDesktopServices::storageLocation(QDesktopServices::DataLocation) + QLatin1String("/qtc-qmldump/") + QString::number(hash)) + slash;
+ << (QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/data/qtc-qmldump/") + QString::number(hash)) + slash;
return directories;
}
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 49c3c89eb0d..50587914c2c 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -139,8 +139,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent)
// setup parent items for auto-detected and manual versions
m_ui->qtdirList->header()->setStretchLastSection(false);
- m_ui->qtdirList->header()->setResizeMode(0, QHeaderView::ResizeToContents);
- m_ui->qtdirList->header()->setResizeMode(1, QHeaderView::Stretch);
+ m_ui->qtdirList->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+ m_ui->qtdirList->header()->setSectionResizeMode(1, QHeaderView::Stretch);
m_ui->qtdirList->setTextElideMode(Qt::ElideNone);
m_autoItem = new QTreeWidgetItem(m_ui->qtdirList);
m_autoItem->setText(0, tr("Auto-detected"));
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index 84a600d097c..fcbaac2e655 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -547,9 +547,6 @@ void ResourceFile::clearPrefixList()
ResourceModel::ResourceModel(const ResourceFile &resource_file, QObject *parent)
: QAbstractItemModel(parent), m_resource_file(resource_file), m_dirty(false)
{
- // Only action that works for QListWidget and the like.
- setSupportedDragActions(Qt::CopyAction);
-
m_prefixIcon = Core::FileIconProvider::overlayIcon(QStyle::SP_DirIcon,
QIcon(QLatin1String(":/resourceeditor/images/qt_qrc.png")), QSize(16, 16));
}
diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp
index 3b0e5845ab4..d382548a104 100644
--- a/src/plugins/texteditor/basehoverhandler.cpp
+++ b/src/plugins/texteditor/basehoverhandler.cpp
@@ -159,12 +159,12 @@ void BaseHoverHandler::process(BaseTextEditor *editor, int pos)
void BaseHoverHandler::decorateToolTip()
{
if (Qt::mightBeRichText(toolTip()))
- setToolTip(Qt::escape(toolTip()));
+ setToolTip(toolTip().toHtmlEscaped());
if (!isDiagnosticTooltip() && lastHelpItemIdentified().isValid()) {
const QString &contents = lastHelpItemIdentified().extractContent(false);
if (!contents.isEmpty()) {
- setToolTip(Qt::escape(toolTip()));
+ setToolTip(toolTip().toHtmlEscaped());
appendToolTip(contents);
addF1ToToolTip();
}
diff --git a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp
index a794a650178..1960fdb5eda 100644
--- a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp
+++ b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp
@@ -52,7 +52,7 @@ ManageDefinitionsDialog::ManageDefinitionsDialog(
ui.setupUi(this);
ui.definitionsTable->setHorizontalHeaderLabels(
QStringList() << tr("Name") << tr("Installed") << tr("Available"));
- ui.definitionsTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+ ui.definitionsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
setWindowTitle(tr("Download Definitions"));
diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp
index d7f8a4296a2..cc693a0d332 100644
--- a/src/plugins/texteditor/snippets/snippet.cpp
+++ b/src/plugins/texteditor/snippets/snippet.cpp
@@ -164,7 +164,7 @@ QString Snippet::generateTip() const
static const QLatin1String kCloseBold("</b>");
static const QLatin1String kEllipsis("...");
- QString escapedContent(Qt::escape(m_content));
+ QString escapedContent(m_content.toHtmlEscaped());
escapedContent.replace(kNewLine, kBr);
escapedContent.replace(kSpace, kNbsp);
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 2aec39c991f..ac475740b87 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -330,7 +330,7 @@ void TextEditorActionHandlerPrivate::createActions()
QKeySequence(Qt::Key_F2));
m_jumpToFileInNextSplitAction = registerAction(JUMP_TO_FILE_UNDER_CURSOR_IN_NEXT_SPLIT,
[this] (BaseTextEditorWidget *w) { w->openLinkUnderCursorInNextSplit(); }, true,
- QKeySequence(Utils::HostOsInfo::isMacHost() ? tr("Meta+E, F2") : tr("Ctrl+E, F2")));
+ QKeySequence(Utils::HostOsInfo::isMacHost() ? tr("Meta+E, F2") : tr("Ctrl+E, F2")).toString());
m_viewPageUpAction = registerAction(VIEW_PAGE_UP,
[this] (BaseTextEditorWidget *w) { w->viewPageUp(); }, true, tr("Move the View a Page Up and Keep the Cursor Position"),
diff --git a/src/plugins/todo/todooutputtreeview.cpp b/src/plugins/todo/todooutputtreeview.cpp
index 8ae3af9e69f..483c4293d03 100644
--- a/src/plugins/todo/todooutputtreeview.cpp
+++ b/src/plugins/todo/todooutputtreeview.cpp
@@ -50,9 +50,9 @@ TodoOutputTreeView::TodoOutputTreeView(QWidget *parent) :
setAttribute(Qt::WA_MacShowFocusRect, false);
setSelectionBehavior(QTreeView::SelectRows);
- header()->setResizeMode(QHeaderView::Interactive);
+ header()->setSectionResizeMode(QHeaderView::Interactive);
header()->setStretchLastSection(true);
- header()->setMovable(false);
+ header()->setSectionsMovable(false);
connect(header(), SIGNAL(sectionResized(int,int,int)), SLOT(todoColumnResized(int,int,int)));
loadDisplaySettings();
}
diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
index d2825cd5427..acb36a95e1f 100644
--- a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
@@ -248,7 +248,7 @@ QVariant DataModel::data(const QModelIndex &index, int role) const
QString entry = QLatin1String("<dt>%1</dt><dd>%2</dd>\n");
// body, function info first
- ret += entry.arg(tr("Function:")).arg(Qt::escape(func->name()));
+ ret += entry.arg(tr("Function:")).arg(func->name().toHtmlEscaped());
ret += entry.arg(tr("File:")).arg(func->file());
if (!func->costItems().isEmpty()) {
const CostItem *firstItem = func->costItems().first();
diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp
index a5782a39858..b1c3a94fb31 100644
--- a/src/plugins/valgrind/memcheckerrorview.cpp
+++ b/src/plugins/valgrind/memcheckerrorview.cpp
@@ -168,7 +168,7 @@ static QString makeFrameName(const Frame &frame, const QString &relativeTo,
if (frame.line() != -1)
path += QLatin1Char(':') + QString::number(frame.line());
- path = Qt::escape(path);
+ path = path.toHtmlEscaped();
if (link && !f.isEmpty() && QFile::exists(fullPath)) {
// make a hyperlink label
@@ -177,7 +177,7 @@ static QString makeFrameName(const Frame &frame, const QString &relativeTo,
}
if (!fn.isEmpty())
- return QCoreApplication::translate("Valgrind::Internal", "%1 in %2").arg(Qt::escape(fn), path);
+ return QCoreApplication::translate("Valgrind::Internal", "%1 in %2").arg(fn.toHtmlEscaped(), path);
if (!path.isEmpty())
return path;
return QString::fromLatin1("0x%1").arg(frame.instructionPointer(), 0, 16);
diff --git a/tests/auto/debugger/dumpers.qbs b/tests/auto/debugger/dumpers.qbs
index e3f10b331c6..24190b8761d 100644
--- a/tests/auto/debugger/dumpers.qbs
+++ b/tests/auto/debugger/dumpers.qbs
@@ -29,7 +29,6 @@ QtcAutotest {
'CDBEXT_PATH="' + project.buildDirectory + '\\\\lib"',
'DUMPERDIR="' + path + '/../../../share/qtcreator/debugger"',
'QT_NO_CAST_FROM_ASCII',
- 'QT_DISABLE_DEPRECATED_BEFORE=0x040900'
])
cpp.includePaths: base.concat([project.debuggerDir])
}
diff --git a/tests/auto/externaltool/externaltool.qbs b/tests/auto/externaltool/externaltool.qbs
index 61fdd0ce995..99d3e27af57 100644
--- a/tests/auto/externaltool/externaltool.qbs
+++ b/tests/auto/externaltool/externaltool.qbs
@@ -20,8 +20,4 @@ QtcAutotest {
name: "Test sources"
files: "tst_externaltooltest.cpp"
}
-
- cpp.defines: base.concat([
- "QT_DISABLE_DEPRECATED_BEFORE=0x040900",
- ])
}
diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs
index 1c702effe03..f51f161cc6a 100644
--- a/tests/auto/valgrind/valgrindautotest.qbs
+++ b/tests/auto/valgrind/valgrindautotest.qbs
@@ -31,9 +31,5 @@ QtcAutotest {
"valgrindrunner.h", "valgrindrunner.cpp",
]
}
-
- cpp.defines: base.concat([
- 'QT_DISABLE_DEPRECATED_BEFORE=0x040900',
- ])
cpp.includePaths: base.concat([project.ide_source_tree + "/src/plugins"])
}
--
GitLab