diff options
| author | Jari Helaakoski <jari.helaakoski@qt.io> | 2024-04-24 13:39:38 +0300 |
|---|---|---|
| committer | Jari Helaakoski <jari.helaakoski@qt.io> | 2024-05-06 14:29:02 +0000 |
| commit | 30cc8a28de3ccc7d02c11c74144971ae289cf076 (patch) | |
| tree | 2c6f8a2872b3a453f4349610cbb0a7df0b0cda55 /src/gui | |
| parent | 7feaf9d41ed962dba04ce29d3a285c54ed04e9fc (diff) | |
Fix test compilation issues with QtLite configuration
Now developer build tests compile, but some are not working.
Functional fix will come later via separate tasks.
Task-number: QTBUG-122999
Change-Id: I70487b46c1b32ba4279cb02a4978e4f55ac0d310
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.cmake | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qguivariant.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index e1d8efb292..da08863ac6 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -893,7 +893,7 @@ qt_feature("jpeg" PRIVATE CONDITION QT_FEATURE_imageformatplugin DISABLE INPUT_libjpeg STREQUAL 'no' ) -qt_feature_definition("jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE) +qt_feature_definition("jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE VALUE "1") qt_feature("system-jpeg" PRIVATE LABEL " Using system libjpeg" CONDITION QT_FEATURE_jpeg AND JPEG_FOUND diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index fe72e7782f..78a1660355 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -78,7 +78,9 @@ static constexpr struct : QMetaTypeModuleHelper // either two nullptrs from canConvert, or two valid pointers Q_ASSERT(onlyCheck || (bool(from) && bool(to))); +#if QT_CONFIG(shortcut) using Int = int; +#endif switch (makePair(toTypeId, fromTypeId)) { QMETATYPE_CONVERTER(QByteArray, QColor, result = source.name(source.alpha() != 255 ? diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index a18157ab9b..08512bead5 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1396,7 +1396,9 @@ void QTextEngine::shapeText(int item) const QFontEngine *fontEngine = this->fontEngine(si, &si.ascent, &si.descent, &si.leading); +#if QT_CONFIG(harfbuzz) bool kerningEnabled; +#endif bool letterSpacingIsAbsolute; bool shapingEnabled = false; QHash<QFont::Tag, quint32> features; @@ -1405,8 +1407,8 @@ void QTextEngine::shapeText(int item) const if (useRawFont) { QTextCharFormat f = format(&si); QFont font = f.font(); - kerningEnabled = font.kerning(); # if QT_CONFIG(harfbuzz) + kerningEnabled = font.kerning(); shapingEnabled = QFontEngine::scriptRequiresOpenType(QChar::Script(si.analysis.script)) || (font.styleStrategy() & QFont::PreferNoShaping) == 0; # endif @@ -1418,8 +1420,8 @@ void QTextEngine::shapeText(int item) const #endif { QFont font = this->font(si); - kerningEnabled = font.d->kerning; #if QT_CONFIG(harfbuzz) + kerningEnabled = font.d->kerning; shapingEnabled = QFontEngine::scriptRequiresOpenType(QChar::Script(si.analysis.script)) || (font.d->request.styleStrategy & QFont::PreferNoShaping) == 0; #endif |