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

Fix warnings about unused variables

Browse Source 
Change-Id: I0bb76529a28c4288967cb79972c1863a0b1c84c6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-02-04 15:50:15 +01:00
parent 3d1b456dab
commit 59d24fa268
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp
View File

@@ -127,7 +127,7 @@ void ImageCacheFontCollector::start(Utils::SmallStringView name,
AbortCallback abortCallback) AbortCallback abortCallback)
{ {
QFont font; QFont font;
if (int fontId = resolveFont(QString(name), font) >= 0) { if (resolveFont(QString(name), font) >= 0) {
auto &&auxiliaryData = Utils::get<ImageCache::FontCollectorSizeAuxiliaryData>(auxiliaryDataValue); auto &&auxiliaryData = Utils::get<ImageCache::FontCollectorSizeAuxiliaryData>(auxiliaryDataValue);
QColor textColor = auxiliaryData.colorName; QColor textColor = auxiliaryData.colorName;
QSize size = auxiliaryData.size; QSize size = auxiliaryData.size;
@@ -149,7 +149,7 @@ std::pair<QImage, QImage> ImageCacheFontCollector::createImage(
const ImageCache::AuxiliaryData &auxiliaryDataValue) const ImageCache::AuxiliaryData &auxiliaryDataValue)
{ {
QFont font; QFont font;
if (int fontId = resolveFont(QString(name), font) >= 0) { if (resolveFont(QString(name), font) >= 0) {
auto &&auxiliaryData = Utils::get<ImageCache::FontCollectorSizeAuxiliaryData>(auxiliaryDataValue); auto &&auxiliaryData = Utils::get<ImageCache::FontCollectorSizeAuxiliaryData>(auxiliaryDataValue);
QColor textColor = auxiliaryData.colorName; QColor textColor = auxiliaryData.colorName;
QSize size = auxiliaryData.size; QSize size = auxiliaryData.size;
@@ -171,7 +171,7 @@ QIcon ImageCacheFontCollector::createIcon(Utils::SmallStringView name,
QIcon icon; QIcon icon;
QFont font; QFont font;
if (int fontId = resolveFont(QString(name), font) >= 0) { if (resolveFont(QString(name), font) >= 0) {
auto &&auxiliaryData = Utils::get<ImageCache::FontCollectorSizesAuxiliaryData>(auxiliaryDataValue); auto &&auxiliaryData = Utils::get<ImageCache::FontCollectorSizesAuxiliaryData>(auxiliaryDataValue);
QColor textColor = auxiliaryData.colorName; QColor textColor = auxiliaryData.colorName;
const auto sizes = auxiliaryData.sizes; const auto sizes = auxiliaryData.sizes;

4
tests/auto/qml/codemodel/check/tst_check.cpp
View File

@@ -100,9 +100,9 @@ void tst_Check::initTestCase()
for (auto p: paths) for (auto p: paths)
lPaths.maybeInsert(Utils::FilePath::fromString(p), Dialect::Qml); lPaths.maybeInsert(Utils::FilePath::fromString(p), Dialect::Qml);
ModelManagerInterface::importScan(result, ModelManagerInterface::workingCopy(), lPaths, ModelManagerInterface::importScan(result, ModelManagerInterface::workingCopy(), lPaths,
ModelManagerInterface::instance(), false); modelManager, false);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
ModelManagerInterface::instance()->test_joinAllThreads(); modelManager->test_joinAllThreads();
QCoreApplication::processEvents(); QCoreApplication::processEvents();
} }