include/sal/log-areas.dox | 4 +--
include/vcl/sysdata.hxx | 2 -
vcl/qt5/QtAccessibleEventListener.cxx | 2 -
vcl/qt5/QtAccessibleWidget.cxx | 36 +++++++++++++++++-----------------
vcl/qt5/QtClipboard.cxx | 2 -
vcl/qt5/QtData.cxx | 3 --
vcl/qt5/QtFilePicker.cxx | 22 ++++++++++----------
vcl/qt5/QtFontFace.cxx | 4 +--
vcl/qt5/QtFrame.cxx | 4 +--
vcl/qt5/QtInstance.cxx | 8 +++----
vcl/qt5/QtObject.cxx | 2 -
vcl/qt5/QtOpenGLContext.cxx | 6 ++---
vcl/qt5/QtTransferable.cxx | 3 --
vcl/qt5/QtWidget.cxx | 6 ++---
14 files changed, 51 insertions(+), 53 deletions(-)
New commits:
commit 535d406854f38c717386c6ffa0f895d204ae7038
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Oct 22 14:41:21 2021 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Oct 22 19:36:05 2021 +0200
qt: Adapt log area: "vcl.qt5" -> "vcl.qt"
And also: "vcl.opengl.qt5" -> "vcl.opengl.qt"
Change-Id: I86f8a34cb8c1303a81ffbf40c801ba628f3fa0d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124065
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index f880b9c28ef4..aa3e64d793bd 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -485,13 +485,13 @@ certain functionality.
@li @c vcl.layout - Widget layout
@li @c vcl.lazydelete
@li @c vcl.opengl
-@li @c vcl.opengl.qt5 - QT5 OpenGL
+@li @c vcl.opengl.qt - Qt OpenGL
@li @c vcl.osx
@li @c vcl.osx.clipboard
@li @c vcl.osx.print
@li @c vcl.pdfwriter
@li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
-@li @c vcl.qt5 - QT5
+@li @c vcl.qt - Qt
@li @c vcl.quartz
@li @c vcl.schedule - scheduler / main-loop information
@li @c vcl.schedule.deinit
diff --git a/vcl/qt5/QtAccessibleEventListener.cxx
b/vcl/qt5/QtAccessibleEventListener.cxx
index fa8c540024c4..1ceb6f6de0e1 100644
--- a/vcl/qt5/QtAccessibleEventListener.cxx
+++ b/vcl/qt5/QtAccessibleEventListener.cxx
@@ -163,7 +163,7 @@ void QtAccessibleEventListener::notifyEvent(const
css::accessibility::Accessible
case AccessibleEventId::LISTBOX_ENTRY_COLLAPSED:
case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS:
default:
- SAL_WARN("vcl.qt5", "Unmapped AccessibleEventId: " <<
aEvent.EventId);
+ SAL_WARN("vcl.qt", "Unmapped AccessibleEventId: " <<
aEvent.EventId);
return;
}
}
diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx
index ed639b524028..0211fc045c27 100644
--- a/vcl/qt5/QtAccessibleWidget.cxx
+++ b/vcl/qt5/QtAccessibleWidget.cxx
@@ -86,14 +86,14 @@ Reference<XAccessibleContext>
QtAccessibleWidget::getAccessibleContextImpl() con
}
catch (css::lang::DisposedException /*ex*/)
{
- SAL_WARN("vcl.qt5", "Accessible context disposed already");
+ SAL_WARN("vcl.qt", "Accessible context disposed already");
}
// sometimes getAccessibleContext throws also RuntimeException if
context is no longer alive
catch (css::uno::RuntimeException /*ex*/)
{
// so let's catch it here, cuz otherwise soffice falls flat on its
face
// with FatalError and nothing else
- SAL_WARN("vcl.qt5", "Accessible context no longer alive");
+ SAL_WARN("vcl.qt", "Accessible context no longer alive");
}
}
@@ -156,7 +156,7 @@ sal_Int16
lcl_matchQtTextBoundaryType(QAccessible::TextBoundaryType boundaryType
break;
}
- SAL_WARN("vcl.qt5", "Unmatched text boundary type: " << boundaryType);
+ SAL_WARN("vcl.qt", "Unmatched text boundary type: " << boundaryType);
return -1;
}
@@ -180,7 +180,7 @@ QAccessible::Relation lcl_matchUnoRelation(short
relationType)
case AccessibleRelationType::NODE_CHILD_OF:
case AccessibleRelationType::DESCRIBED_BY:
default:
- SAL_WARN("vcl.qt5", "Unmatched relation: " << relationType);
+ SAL_WARN("vcl.qt", "Unmatched relation: " << relationType);
return {};
}
}
@@ -198,7 +198,7 @@ short lcl_matchQtRelation(QAccessible::Relation
relationType)
case QAccessible::Labelled:
return AccessibleRelationType::LABELED_BY;
default:
- SAL_WARN("vcl.qt5", "Unmatched relation: " << relationType);
+ SAL_WARN("vcl.qt", "Unmatched relation: " << relationType);
}
return 0;
}
@@ -573,7 +573,7 @@ QAccessible::Role QtAccessibleWidget::role() const
}
}
- SAL_WARN("vcl.qt5", "Unmapped role: " <<
getAccessibleContextImpl()->getAccessibleRole());
+ SAL_WARN("vcl.qt", "Unmapped role: " <<
getAccessibleContextImpl()->getAccessibleRole());
return QAccessible::NoRole;
}
@@ -683,7 +683,7 @@ void lcl_addState(QAccessible::State* state, sal_Int16
nState)
state->multiSelectable = true;
break;
default:
- SAL_WARN("vcl.qt5", "Unmapped state: " << nState);
+ SAL_WARN("vcl.qt", "Unmapped state: " << nState);
break;
}
}
@@ -848,7 +848,7 @@ QStringList QtAccessibleWidget::keyBindingsForAction(const
QString& actionName)
// QAccessibleTextInterface
void QtAccessibleWidget::addSelection(int /* startOffset */, int /* endOffset
*/)
{
- SAL_INFO("vcl.qt5", "Unsupported QAccessibleTextInterface::addSelection");
+ SAL_INFO("vcl.qt", "Unsupported QAccessibleTextInterface::addSelection");
}
namespace
@@ -941,7 +941,7 @@ int QtAccessibleWidget::characterCount() const
}
QRect QtAccessibleWidget::characterRect(int /* offset */) const
{
- SAL_INFO("vcl.qt5", "Unsupported QAccessibleTextInterface::characterRect");
+ SAL_INFO("vcl.qt", "Unsupported QAccessibleTextInterface::characterRect");
return QRect();
}
@@ -955,12 +955,12 @@ int QtAccessibleWidget::cursorPosition() const
int QtAccessibleWidget::offsetAtPoint(const QPoint& /* point */) const
{
- SAL_INFO("vcl.qt5", "Unsupported QAccessibleTextInterface::offsetAtPoint");
+ SAL_INFO("vcl.qt", "Unsupported QAccessibleTextInterface::offsetAtPoint");
return 0;
}
void QtAccessibleWidget::removeSelection(int /* selectionIndex */)
{
- SAL_INFO("vcl.qt5", "Unsupported
QAccessibleTextInterface::removeSelection");
+ SAL_INFO("vcl.qt", "Unsupported
QAccessibleTextInterface::removeSelection");
}
void QtAccessibleWidget::scrollToSubstring(int startIndex, int endIndex)
{
@@ -1014,7 +1014,7 @@ QString QtAccessibleWidget::textAfterOffset(int /* offset
*/,
QAccessible::TextBoundaryType /*
boundaryType */,
int* /* startOffset */, int* /*
endOffset */) const
{
- SAL_INFO("vcl.qt5", "Unsupported
QAccessibleTextInterface::textAfterOffset");
+ SAL_INFO("vcl.qt", "Unsupported
QAccessibleTextInterface::textAfterOffset");
return QString();
}
@@ -1049,7 +1049,7 @@ QString QtAccessibleWidget::textBeforeOffset(int /*
offset */,
QAccessible::TextBoundaryType /*
boundaryType */,
int* /* startOffset */, int* /*
endOffset */) const
{
- SAL_INFO("vcl.qt5", "Unsupported
QAccessibleTextInterface::textBeforeOffset");
+ SAL_INFO("vcl.qt", "Unsupported
QAccessibleTextInterface::textBeforeOffset");
return QString();
}
@@ -1288,13 +1288,13 @@ bool QtAccessibleWidget::selectRow(int row)
int QtAccessibleWidget::selectedCellCount() const
{
- SAL_INFO("vcl.qt5", "Unsupported
QAccessibleTableInterface::selectedCellCount");
+ SAL_INFO("vcl.qt", "Unsupported
QAccessibleTableInterface::selectedCellCount");
return 0;
}
QList<QAccessibleInterface*> QtAccessibleWidget::selectedCells() const
{
- SAL_INFO("vcl.qt5", "Unsupported
QAccessibleTableInterface::selectedCells");
+ SAL_INFO("vcl.qt", "Unsupported QAccessibleTableInterface::selectedCells");
return QList<QAccessibleInterface*>();
}
@@ -1384,7 +1384,7 @@ bool QtAccessibleWidget::unselectRow(int row)
QList<QAccessibleInterface*> QtAccessibleWidget::columnHeaderCells() const
{
- SAL_WARN("vcl.qt5", "Unsupported
QAccessibleTableCellInterface::columnHeaderCells");
+ SAL_WARN("vcl.qt", "Unsupported
QAccessibleTableCellInterface::columnHeaderCells");
return QList<QAccessibleInterface*>();
}
@@ -1434,7 +1434,7 @@ int QtAccessibleWidget::columnExtent() const
QList<QAccessibleInterface*> QtAccessibleWidget::rowHeaderCells() const
{
- SAL_WARN("vcl.qt5", "Unsupported
QAccessibleTableCellInterface::rowHeaderCells");
+ SAL_WARN("vcl.qt", "Unsupported
QAccessibleTableCellInterface::rowHeaderCells");
return QList<QAccessibleInterface*>();
}
@@ -1469,7 +1469,7 @@ int QtAccessibleWidget::rowIndex() const
QAccessibleInterface* QtAccessibleWidget::table() const
{
- SAL_WARN("vcl.qt5", "Unsupported QAccessibleTableCellInterface::table");
+ SAL_WARN("vcl.qt", "Unsupported QAccessibleTableCellInterface::table");
return nullptr;
}
diff --git a/vcl/qt5/QtClipboard.cxx b/vcl/qt5/QtClipboard.cxx
index f21e9d02aa50..893c58274238 100644
--- a/vcl/qt5/QtClipboard.cxx
+++ b/vcl/qt5/QtClipboard.cxx
@@ -52,7 +52,7 @@ css::uno::Reference<css::uno::XInterface>
QtClipboard::create(const OUString& aM
auto iter = aNameToClipboardMap.find(aModeString);
if (iter != aNameToClipboardMap.end() && isSupported(iter->second))
return static_cast<cppu::OWeakObject*>(new QtClipboard(aModeString,
iter->second));
- SAL_WARN("vcl.qt5", "Ignoring unrecognized clipboard type: '" <<
aModeString << "'");
+ SAL_WARN("vcl.qt", "Ignoring unrecognized clipboard type: '" <<
aModeString << "'");
return css::uno::Reference<css::uno::XInterface>();
}
diff --git a/vcl/qt5/QtData.cxx b/vcl/qt5/QtData.cxx
index dc435fdbd358..e67abdd76224 100644
--- a/vcl/qt5/QtData.cxx
+++ b/vcl/qt5/QtData.cxx
@@ -311,8 +311,7 @@ QCursor& QtData::getCursor(PointerStyle ePointerStyle)
if (!pCursor)
{
pCursor = new QCursor(Qt::ArrowCursor);
- SAL_WARN("vcl.qt5",
- "pointer " << static_cast<int>(ePointerStyle) << " not
implemented");
+ SAL_WARN("vcl.qt", "pointer " << static_cast<int>(ePointerStyle)
<< " not implemented");
}
m_aCursors[ePointerStyle].reset(pCursor);
diff --git a/vcl/qt5/QtFilePicker.cxx b/vcl/qt5/QtFilePicker.cxx
index eda2579c1c58..de8b5f4601c3 100644
--- a/vcl/qt5/QtFilePicker.cxx
+++ b/vcl/qt5/QtFilePicker.cxx
@@ -280,7 +280,7 @@ uno::Sequence<OUString> SAL_CALL
QtFilePicker::getSelectedFiles()
if (intUrl.isEmpty())
{
// If translation failed, fall back to original URL:
- SAL_WARN("vcl.qt5", "cannot convert <" << extUrl << "> from locale
encoding to UTF-8");
+ SAL_WARN("vcl.qt", "cannot convert <" << extUrl << "> from locale
encoding to UTF-8");
intUrl = extUrl;
}
seq[i++] = intUrl;
@@ -397,7 +397,7 @@ uno::Any QtFilePicker::handleGetListValue(const QComboBox*
pWidget, sal_Int16 nC
break;
}
default:
- SAL_WARN("vcl.qt5",
+ SAL_WARN("vcl.qt",
"undocumented/unimplemented ControlAction for a list " <<
nControlAction);
break;
}
@@ -444,7 +444,7 @@ void QtFilePicker::handleSetListValue(QComboBox* pWidget,
sal_Int16 nControlActi
break;
}
default:
- SAL_WARN("vcl.qt5",
+ SAL_WARN("vcl.qt",
"undocumented/unimplemented ControlAction for a list " <<
nControlAction);
break;
}
@@ -480,7 +480,7 @@ void SAL_CALL QtFilePicker::setValue(sal_Int16 controlId,
sal_Int16 nControlActi
}
}
else
- SAL_WARN("vcl.qt5", "set value on unknown control " << controlId);
+ SAL_WARN("vcl.qt", "set value on unknown control " << controlId);
}
uno::Any SAL_CALL QtFilePicker::getValue(sal_Int16 controlId, sal_Int16
nControlAction)
@@ -512,7 +512,7 @@ uno::Any SAL_CALL QtFilePicker::getValue(sal_Int16
controlId, sal_Int16 nControl
}
}
else
- SAL_WARN("vcl.qt5", "get value on unknown control " << controlId);
+ SAL_WARN("vcl.qt", "get value on unknown control " << controlId);
return res;
}
@@ -526,7 +526,7 @@ void SAL_CALL QtFilePicker::enableControl(sal_Int16
controlId, sal_Bool enable)
if (m_aCustomWidgetsMap.contains(controlId))
m_aCustomWidgetsMap.value(controlId)->setEnabled(enable);
else
- SAL_WARN("vcl.qt5", "enable unknown control " << controlId);
+ SAL_WARN("vcl.qt", "enable unknown control " << controlId);
});
}
@@ -548,7 +548,7 @@ void SAL_CALL QtFilePicker::setLabel(sal_Int16 controlId,
const OUString& label)
cb->setText(toQString(label));
}
else
- SAL_WARN("vcl.qt5", "set label on unknown control " << controlId);
+ SAL_WARN("vcl.qt", "set label on unknown control " << controlId);
}
OUString SAL_CALL QtFilePicker::getLabel(sal_Int16 controlId)
@@ -571,7 +571,7 @@ OUString SAL_CALL QtFilePicker::getLabel(sal_Int16
controlId)
label = cb->text();
}
else
- SAL_WARN("vcl.qt5", "get label on unknown control " << controlId);
+ SAL_WARN("vcl.qt", "get label on unknown control " << controlId);
return toOUString(label);
}
@@ -905,7 +905,7 @@ void QtFilePicker::updateAutomaticFileExtension()
{
// fall back to setting none otherwise
SAL_INFO(
- "vcl.qt5",
+ "vcl.qt",
"Unable to retrieve unambiguous file extension. Will not add
any automatically.");
bSetAutoExtension = false;
}
@@ -919,7 +919,7 @@ void QtFilePicker::filterSelected(const QString&)
{
FilePickerEvent aEvent;
aEvent.ElementId = LISTBOX_FILTER;
- SAL_INFO("vcl.qt5", "filter changed");
+ SAL_INFO("vcl.qt", "filter changed");
if (m_xListener.is())
m_xListener->controlStateChanged(aEvent);
}
@@ -927,7 +927,7 @@ void QtFilePicker::filterSelected(const QString&)
void QtFilePicker::currentChanged(const QString&)
{
FilePickerEvent aEvent;
- SAL_INFO("vcl.qt5", "file selection changed");
+ SAL_INFO("vcl.qt", "file selection changed");
if (m_xListener.is())
m_xListener->fileSelectionChanged(aEvent);
}
diff --git a/vcl/qt5/QtFontFace.cxx b/vcl/qt5/QtFontFace.cxx
index e69bfa717e45..89182d115756 100644
--- a/vcl/qt5/QtFontFace.cxx
+++ b/vcl/qt5/QtFontFace.cxx
@@ -172,12 +172,12 @@ QFont QtFontFace::CreateFont() const
if (3 == aStrList.size())
aFont = aFDB.font(aStrList[0], aStrList[1],
aStrList[2].toInt());
else
- SAL_WARN("vcl.qt5", "Invalid QFontDatabase font ID " <<
m_aFontId);
+ SAL_WARN("vcl.qt", "Invalid QFontDatabase font ID " <<
m_aFontId);
break;
}
case Font:
bool bRet = aFont.fromString(m_aFontId);
- SAL_WARN_IF(!bRet, "vcl.qt5", "Failed to create QFont from ID: "
<< m_aFontId);
+ SAL_WARN_IF(!bRet, "vcl.qt", "Failed to create QFont from ID: " <<
m_aFontId);
Q_UNUSED(bRet);
break;
}
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 87cfc5f90f74..2d4a068a34b1 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -1177,7 +1177,7 @@ KeyIndicatorState QtFrame::GetIndicatorState() { return
KeyIndicatorState(); }
void QtFrame::SimulateKeyPress(sal_uInt16 nKeyCode)
{
- SAL_WARN("vcl.qt5", "missing simulate keypress " << nKeyCode);
+ SAL_WARN("vcl.qt", "missing simulate keypress " << nKeyCode);
}
void QtFrame::SetParent(SalFrame* pNewParent) { m_pParent =
static_cast<QtFrame*>(pNewParent); }
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index 42b7a8ed8a48..06840ad7281f 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -588,9 +588,9 @@ void* QtInstance::CreateGStreamerSink(const
SystemChildWindow* pWindow)
}
else
{
- SAL_WARN("vcl.qt5", "Couldn't initialize qwidget5videosink."
- " Video playback might not work as expected."
- " Please install Qt5 packages for QtGStreamer.");
+ SAL_WARN("vcl.qt", "Couldn't initialize qwidget5videosink."
+ " Video playback might not work as expected."
+ " Please install Qt5 packages for QtGStreamer.");
// with no videosink explicitly set, GStreamer will open its own
(misplaced) window(s) to display video
}
@@ -606,7 +606,7 @@ void QtInstance::AllocFakeCmdlineArgs(std::unique_ptr<char*
[]>& rFakeArgv,
std::vector<FreeableCStr>&
rFakeArgvFreeable)
{
OString aVersion(qVersion());
- SAL_INFO("vcl.qt5", "qt version string is " << aVersion);
+ SAL_INFO("vcl.qt", "qt version string is " << aVersion);
const sal_uInt32 nParams = osl_getCommandArgCount();
sal_uInt32 nDisplayValueIdx = 0;
diff --git a/vcl/qt5/QtOpenGLContext.cxx b/vcl/qt5/QtOpenGLContext.cxx
index ab2e228f1dcc..9dd75b69a1c9 100644
--- a/vcl/qt5/QtOpenGLContext.cxx
+++ b/vcl/qt5/QtOpenGLContext.cxx
@@ -75,7 +75,7 @@ bool QtOpenGLContext::ImplInit()
{
if (!m_pWindow)
{
- SAL_WARN("vcl.opengl.qt5", "failed to create window");
+ SAL_WARN("vcl.opengl.qt", "failed to create window");
return false;
}
@@ -85,7 +85,7 @@ bool QtOpenGLContext::ImplInit()
m_pContext = new QOpenGLContext(m_pWindow);
if (!m_pContext->create())
{
- SAL_WARN("vcl.opengl.qt5", "failed to create context");
+ SAL_WARN("vcl.opengl.qt", "failed to create context");
return false;
}
@@ -132,7 +132,7 @@ void QtOpenGLContext::destroyCurrentContext()
if (glGetError() != GL_NO_ERROR)
{
- SAL_WARN("vcl.opengl.qt5", "glError: " << glGetError());
+ SAL_WARN("vcl.opengl.qt", "glError: " << glGetError());
}
}
diff --git a/vcl/qt5/QtTransferable.cxx b/vcl/qt5/QtTransferable.cxx
index 60cd195f4ddc..737468c0b5a5 100644
--- a/vcl/qt5/QtTransferable.cxx
+++ b/vcl/qt5/QtTransferable.cxx
@@ -167,8 +167,7 @@ QtClipboardTransferable::QtClipboardTransferable(const
QClipboard::Mode aMode,
bool QtClipboardTransferable::hasInFlightChanged() const
{
const bool bChanged(mimeData() !=
QApplication::clipboard()->mimeData(m_aMode));
- SAL_WARN_IF(bChanged, "vcl.qt5",
- "In flight clipboard change detected - broken clipboard
read!");
+ SAL_WARN_IF(bChanged, "vcl.qt", "In flight clipboard change detected -
broken clipboard read!");
return bChanged;
}
diff --git a/vcl/qt5/QtWidget.cxx b/vcl/qt5/QtWidget.cxx
index 7c40ea1c4baf..44952f9318b0 100644
--- a/vcl/qt5/QtWidget.cxx
+++ b/vcl/qt5/QtWidget.cxx
@@ -693,8 +693,8 @@ void QtWidget::inputMethodEvent(QInputMethodEvent* pEvent)
break;
}
default:
- SAL_WARN("vcl.qt5", "Unhandled QInputMethodEvent
attribute: "
- << static_cast<int>(rAttr.type));
+ SAL_WARN("vcl.qt", "Unhandled QInputMethodEvent attribute:
"
+ << static_cast<int>(rAttr.type));
break;
}
}
@@ -731,7 +731,7 @@ static bool lcl_retrieveSurrounding(sal_Int32& rPosition,
sal_Int32& rAnchor, QS
}
catch (const uno::Exception&)
{
- TOOLS_WARN_EXCEPTION("vcl.qt5", "Exception in getting input method
surrounding text");
+ TOOLS_WARN_EXCEPTION("vcl.qt", "Exception in getting input method
surrounding text");
}
if (xText.is())
commit 107f4f2a6d6a2d84ff8104b1de16b1e06c2af131
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Oct 22 14:30:10 2021 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Oct 22 19:35:50 2021 +0200
Rename SystemEnvData::Toolkit::{Qt5 -> Qt}
It's used for the qt6 VCL plugin as well.
Change-Id: I3f57258c2c8e3c12532d79b44f24105a30590675
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124064
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 85babeaa2f1c..57d9c2220ecf 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -50,7 +50,7 @@ typedef struct CGContext *CGContextRef;
struct VCL_DLLPUBLIC SystemEnvData
{
- enum class Toolkit { Gen, Gtk, Qt5 };
+ enum class Toolkit { Gen, Gtk, Qt };
Toolkit toolkit; // the toolkit in use
#if defined(_WIN32)
HWND hWnd; // the window hwnd
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 60e83ce1a423..87cfc5f90f74 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -205,7 +205,7 @@ QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags
nStyle, bool bUseCairo)
//m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pQWidget;
//m_aSystemData.nScreen = m_nXScreen.getXScreen();
- m_aSystemData.toolkit = SystemEnvData::Toolkit::Qt5;
+ m_aSystemData.toolkit = SystemEnvData::Toolkit::Qt;
if (!bWayland)
m_aSystemData.platform = SystemEnvData::Platform::Xcb;
else
diff --git a/vcl/qt5/QtObject.cxx b/vcl/qt5/QtObject.cxx
index 1c9bc8d1fe09..155a78da8ce1 100644
--- a/vcl/qt5/QtObject.cxx
+++ b/vcl/qt5/QtObject.cxx
@@ -45,7 +45,7 @@ QtObject::QtObject(QtFrame* pParent, bool bShow)
//m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pQWidget;
//m_aSystemData.nScreen = m_nXScreen.getXScreen();
- m_aSystemData.toolkit = SystemEnvData::Toolkit::Qt5;
+ m_aSystemData.toolkit = SystemEnvData::Toolkit::Qt;
m_aSystemData.platform = SystemEnvData::Platform::Xcb;
const bool bWayland = QGuiApplication::platformName() == "wayland";
if (!bWayland)
