aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2022-02-23 16:41:44 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2022-02-23 16:57:25 +0000
commitcac1c3d50116cd01d1e5db522102aee6934882ec (patch)
tree3801c2106bb67c0075d5a355994f323abd6375ae
parentfff5944e65db76b447ef6d9579f80fa4eb45d63f (diff)
Fix more warnings
Found by compiling with clang Change-Id: Iec0ed8aa8b6a742a5a3996a6c19c410e209fb048 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/cmakeprojectmanager/configmodel.cpp2
-rw-r--r--src/plugins/cppeditor/cppcodestylesettings.cpp1
-rw-r--r--src/plugins/qmldesigner/designercore/model/model.cpp6
-rw-r--r--src/plugins/qmldesigner/designercore/projectstorage/filesystem.h2
-rw-r--r--src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h2
-rw-r--r--src/plugins/qmldesigner/designmodewidget.cpp4
-rw-r--r--src/plugins/qmlprojectmanager/qmlproject.cpp2
-rw-r--r--src/plugins/studiowelcome/examplecheckout.cpp2
-rw-r--r--src/plugins/updateinfo/updateinfoplugin.cpp2
9 files changed, 9 insertions, 14 deletions
diff --git a/src/plugins/cmakeprojectmanager/configmodel.cpp b/src/plugins/cmakeprojectmanager/configmodel.cpp
index 73f6f1e228..e170fc4917 100644
--- a/src/plugins/cmakeprojectmanager/configmodel.cpp
+++ b/src/plugins/cmakeprojectmanager/configmodel.cpp
@@ -268,7 +268,7 @@ bool ConfigModel::hasChanges(bool initialParameters) const
return initialParameters ? i.isInitial : !i.isInitial;
});
- return Utils::contains(filtered, [initialParameters](const InternalDataItem &i) {
+ return Utils::contains(filtered, [](const InternalDataItem &i) {
return i.isUserChanged || i.isUserNew || i.isUnset;
});
}
diff --git a/src/plugins/cppeditor/cppcodestylesettings.cpp b/src/plugins/cppeditor/cppcodestylesettings.cpp
index f5cc2fda8c..eabaa47a61 100644
--- a/src/plugins/cppeditor/cppcodestylesettings.cpp
+++ b/src/plugins/cppeditor/cppcodestylesettings.cpp
@@ -40,7 +40,6 @@
#include <utils/qtcassert.h>
#include <utils/settingsutils.h>
-static const char groupPostfix[] = "IndentSettings";
static const char indentBlockBracesKey[] = "IndentBlockBraces";
static const char indentBlockBodyKey[] = "IndentBlockBody";
static const char indentClassBracesKey[] = "IndentClassBraces";
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 5f211b8605..39b2418623 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -1576,9 +1576,9 @@ QUrl Model::fileUrl() const
QUrl Model::projectUrl() const
{
#ifndef QMLDESIGNER_TEST
-DesignDocument *document = QmlDesignerPlugin::instance()->viewManager().currentDesignDocument();
-if (document)
- return QUrl::fromLocalFile(document->projectFolder().toString());
+ DesignDocument *document = QmlDesignerPlugin::instance()->viewManager().currentDesignDocument();
+ if (document)
+ return QUrl::fromLocalFile(document->projectFolder().toString());
#endif
return {};
}
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/filesystem.h b/src/plugins/qmldesigner/designercore/projectstorage/filesystem.h
index 041090508e..5c054367c8 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/filesystem.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/filesystem.h
@@ -43,7 +43,7 @@ class ProjectStorage;
using PathCache = SourcePathCache<ProjectStorage<Sqlite::Database>, NonLockingMutex>;
-class FileSystem final : public FileSystemInterface
+class FileSystem : public FileSystemInterface
{
public:
FileSystem(PathCache &sourcePathCache)
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h
index e77ba16bad..c7c182279f 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h
@@ -1924,6 +1924,8 @@ private:
void createTypesAndePropertyDeclarationsTables(Database &database,
const Sqlite::Column &foreignModuleIdColumn)
{
+ Q_UNUSED(foreignModuleIdColumn)
+
Sqlite::Table typesTable;
typesTable.setUseIfNotExists(true);
typesTable.setName("types");
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 584933494b..aa1738a3f1 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -245,11 +245,7 @@ void DesignModeWidget::setup()
m_dockManager->setStyleSheet(Theme::replaceCssColors(sheet));
// Setup icons
- const QColor iconColor(Theme::getColor(Theme::DStitleBarIcon));
-
const QString closeUnicode = Theme::getIconUnicode(Theme::Icon::adsClose);
- const QString menuUnicode = Theme::getIconUnicode(Theme::Icon::adsDropDown);
- const QString undockUnicode = Theme::getIconUnicode(Theme::Icon::adsDetach);
const QString fontName = "qtds_propertyIconFont.ttf";
const QSize size = QSize(28, 28);
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 9191106ed4..0864a47828 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -135,8 +135,6 @@ QmlProject::QmlProject(const Utils::FilePath &fileName)
disconnect(m_openFileConnection);
if (target && success) {
- const Utils::FilePath &folder = projectDirectory() + "/content";
-
Utils::FilePaths uiFiles = getUiQmlFilesForFolder(projectDirectory()
+ "/content");
if (uiFiles.isEmpty())
diff --git a/src/plugins/studiowelcome/examplecheckout.cpp b/src/plugins/studiowelcome/examplecheckout.cpp
index cb7018bf3d..267295b171 100644
--- a/src/plugins/studiowelcome/examplecheckout.cpp
+++ b/src/plugins/studiowelcome/examplecheckout.cpp
@@ -217,7 +217,7 @@ void FileDownloader::probeUrl()
QNetworkReply::connect(reply,
&QNetworkReply::errorOccurred,
this,
- [this, reply](QNetworkReply::NetworkError) {
+ [this](QNetworkReply::NetworkError) {
QQmlData *data = QQmlData::get(this, false);
if (!data) {
qDebug() << Q_FUNC_INFO << "FileDownloader is nullptr.";
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index 353a5d703f..e2271ad396 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -209,7 +209,7 @@ struct QtPackage
QString displayName;
QVersionNumber version;
bool installed;
- bool isPrerelease;
+ bool isPrerelease = false;
};
static QList<QtPackage> availableQtPackages(const QDomDocument &document)