qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate symbol lcTextInput build failure on static builds 

Fixes: QTBUG-105682
Pick-to: 6.4
Change-Id: I8c367403b64b5a976726fff210317b4212ea8695
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
Lorn Potter 2022-08-22 09:47:45 +10:00 committed by Mitch Curtis
parent 1d01bf9f9e
commit 513f6caab8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/quick/items/qquicktextinput.cpp
View File

@ -31,7 +31,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
Q_LOGGING_CATEGORY(lcTextInput, "qt.quick.textInput") Q_LOGGING_CATEGORY(lcQuickTextInput, "qt.quick.textInput")
/*! /*!
\qmltype TextInput \qmltype TextInput
@ -4872,7 +4872,7 @@ void QQuickTextInput::setOldSelectionDefault()
Q_D(QQuickTextInput); Q_D(QQuickTextInput);
d->selectByMouse = false; d->selectByMouse = false;
d->selectByTouchDrag = true; d->selectByTouchDrag = true;
qCDebug(lcTextInput, "pre-6.4 behavior chosen by import version: selectByMouse defaults false; if enabled, touchscreen acts like a mouse"); qCDebug(lcQuickTextInput, "pre-6.4 behavior chosen by import version: selectByMouse defaults false; if enabled, touchscreen acts like a mouse");
} }
// TODO in 6.7.0: remove the note about versions prior to 6.4 in selectByMouse() documentation // TODO in 6.7.0: remove the note about versions prior to 6.4 in selectByMouse() documentation