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

QmlDesigner: Fix test build

Browse Source 
Can't have theme dependency in designercore.

Change-Id: I28b5a4623ed0122fccb886121795eb07467555e9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2021-01-15 12:28:50 +02:00
parent 40c6a6c1b9
commit 261e4bc045
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,9 @@
#include "imagecachefontcollector.h" #include "imagecachefontcollector.h"
#ifndef QMLDESIGNER_TEST // Tests don't care about UI, and can't have theme dependency here
#include <theme.h> #include <theme.h>
#endif
#include <QtGui/qrawfont.h> #include <QtGui/qrawfont.h>
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>
@@ -65,7 +67,11 @@ void ImageCacheFontCollector::start(Utils::SmallStringView name,
if (ok) if (ok)
dim = newDim; dim = newDim;
} }
#ifndef QMLDESIGNER_TEST
QColor textColor(Theme::getColor(Theme::DStextColor)); QColor textColor(Theme::getColor(Theme::DStextColor));
#else
QColor textColor;
#endif
if (hints.size() >= 2) if (hints.size() >= 2)
textColor.setNamedColor(hints[1]); textColor.setNamedColor(hints[1]);
QString text = hints.size() >= 3 ? hints[2] : "Abc"; QString text = hints.size() >= 3 ? hints[2] : "Abc";