1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWidget: fix link error in static build

Browse Source 
QtQuick also uses "lcFocus" as a category name, which
causes link errors in static builds when both QWidget
and QtQuick are linked in one executable.

Making it static is also a good solution, but here
adding a "Widget" prefix seems more consistent.

Change-Id: I0a6a02750bd347f62b67544b4044789612f0fa4d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Zhao Yuhang 2024-04-05 23:25:32 +08:00 committed by Yuhang Zhao
parent dde96f0f47
commit 079578eadd
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/widgets/kernel/qwidget.cpp
View File

@ -85,7 +85,7 @@ using namespace Qt::StringLiterals;
Q_LOGGING_CATEGORY(lcWidgetPainting, "qt.widgets.painting", QtWarningMsg); Q_LOGGING_CATEGORY(lcWidgetPainting, "qt.widgets.painting", QtWarningMsg);
Q_LOGGING_CATEGORY(lcWidgetShowHide, "qt.widgets.showhide", QtWarningMsg); Q_LOGGING_CATEGORY(lcWidgetShowHide, "qt.widgets.showhide", QtWarningMsg);
Q_LOGGING_CATEGORY(lcWidgetWindow, "qt.widgets.window", QtWarningMsg); Q_LOGGING_CATEGORY(lcWidgetWindow, "qt.widgets.window", QtWarningMsg);
Q_LOGGING_CATEGORY(lcFocus, "qt.widgets.focus") Q_LOGGING_CATEGORY(lcWidgetFocus, "qt.widgets.focus")
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
namespace { namespace {
@ -13304,12 +13304,12 @@ bool QWidgetPrivate::removeFromFocusChain(FocusChainRemovalRules rules, FocusDir
if (rules.testFlag(FocusChainRemovalRule::AssertConsistency)) if (rules.testFlag(FocusChainRemovalRule::AssertConsistency))
qFatal() << q << "has inconsistent focus chain."; qFatal() << q << "has inconsistent focus chain.";
#endif #endif
qCDebug(lcFocus) << q << "wasn't removed, because of inconsistent focus chain."; qCDebug(lcWidgetFocus) << q << "wasn't removed, because of inconsistent focus chain.";
return false; return false;
} }
if (!isInFocusChain()) { if (!isInFocusChain()) {
qCDebug(lcFocus) << q << "wasn't removed, because it is not part of a focus chain."; qCDebug(lcWidgetFocus) << q << "wasn't removed, because it is not part of a focus chain.";
return false; return false;
} }
@ -13319,7 +13319,7 @@ bool QWidgetPrivate::removeFromFocusChain(FocusChainRemovalRules rules, FocusDir
FOCUS_NEXT(FOCUS_PREV(q)) = FOCUS_NEXT(q); FOCUS_NEXT(FOCUS_PREV(q)) = FOCUS_NEXT(q);
FOCUS_PREV(FOCUS_NEXT(q)) = FOCUS_PREV(q); FOCUS_PREV(FOCUS_NEXT(q)) = FOCUS_PREV(q);
initFocusChain(); initFocusChain();
qCDebug(lcFocus) << q << "removed from focus chain."; qCDebug(lcWidgetFocus) << q << "removed from focus chain.";
return true; return true;
} }
@ -13330,7 +13330,7 @@ bool QWidgetPrivate::removeFromFocusChain(FocusChainRemovalRules rules, FocusDir
void QWidgetPrivate::initFocusChain() void QWidgetPrivate::initFocusChain()
{ {
Q_Q(QWidget); Q_Q(QWidget);
qCDebug(lcFocus) << "Initializing focus chain of" << q; qCDebug(lcWidgetFocus) << "Initializing focus chain of" << q;
FOCUS_PREV(q) = q; FOCUS_PREV(q) = q;
FOCUS_NEXT(q) = q; FOCUS_NEXT(q) = q;
} }
@ -13390,7 +13390,7 @@ bool QWidgetPrivate::insertIntoFocusChain(FocusDirection direction, QWidget *pos
switch (direction) { switch (direction) {
case FocusDirection::Next: case FocusDirection::Next:
if (previous == position) { if (previous == position) {
qCDebug(lcFocus) << "No-op insertion." << q << "is already before" << position; qCDebug(lcWidgetFocus) << "No-op insertion." << q << "is already before" << position;
return false; return false;
} }
@ -13400,12 +13400,12 @@ bool QWidgetPrivate::insertIntoFocusChain(FocusDirection direction, QWidget *pos
FOCUS_PREV(FOCUS_NEXT(position)) = q; FOCUS_PREV(FOCUS_NEXT(position)) = q;
FOCUS_NEXT(position) = q; FOCUS_NEXT(position) = q;
FOCUS_PREV(q) = position; FOCUS_PREV(q) = position;
qCDebug(lcFocus) << q << "inserted after" << position; qCDebug(lcWidgetFocus) << q << "inserted after" << position;
break; break;
case FocusDirection::Previous: case FocusDirection::Previous:
if (next == position) { if (next == position) {
qCDebug(lcFocus) << "No-op insertion." << q << "is already after" << position; qCDebug(lcWidgetFocus) << "No-op insertion." << q << "is already after" << position;
return false; return false;
} }
@ -13415,7 +13415,7 @@ bool QWidgetPrivate::insertIntoFocusChain(FocusDirection direction, QWidget *pos
FOCUS_NEXT(FOCUS_PREV(position)) = q; FOCUS_NEXT(FOCUS_PREV(position)) = q;
FOCUS_PREV(position) = q; FOCUS_PREV(position) = q;
FOCUS_NEXT(q) = position; FOCUS_NEXT(q) = position;
qCDebug(lcFocus) << q << "inserted before" << position; qCDebug(lcWidgetFocus) << q << "inserted before" << position;
break; break;
} }
@ -13435,7 +13435,7 @@ bool QWidgetPrivate::insertIntoFocusChain(const QWidgetList &toBeInserted,
FocusDirection direction, QWidget *position) FocusDirection direction, QWidget *position)
{ {
if (toBeInserted.isEmpty()) { if (toBeInserted.isEmpty()) {
qCDebug(lcFocus) << "No-op insertion of an empty list"; qCDebug(lcWidgetFocus) << "No-op insertion of an empty list";
return false; return false;
} }
@ -13454,7 +13454,7 @@ bool QWidgetPrivate::insertIntoFocusChain(const QWidgetList &toBeInserted,
switch (direction) { switch (direction) {
case FocusDirection::Previous: case FocusDirection::Previous:
if (FOCUS_PREV(position) == last) { if (FOCUS_PREV(position) == last) {
qCDebug(lcFocus) << "No-op insertion." << toBeInserted << "is already before" qCDebug(lcWidgetFocus) << "No-op insertion." << toBeInserted << "is already before"
<< position; << position;
return false; return false;
} }
@ -13462,11 +13462,11 @@ bool QWidgetPrivate::insertIntoFocusChain(const QWidgetList &toBeInserted,
FOCUS_PREV(first) = FOCUS_PREV(position); FOCUS_PREV(first) = FOCUS_PREV(position);
FOCUS_NEXT(last) = position; FOCUS_NEXT(last) = position;
FOCUS_PREV(position) = last; FOCUS_PREV(position) = last;
qCDebug(lcFocus) << toBeInserted << "inserted before" << position; qCDebug(lcWidgetFocus) << toBeInserted << "inserted before" << position;
break; break;
case FocusDirection::Next: case FocusDirection::Next:
if (FOCUS_PREV(position) == last) { if (FOCUS_PREV(position) == last) {
qCDebug(lcFocus) << "No-op insertion." << toBeInserted << "is already after" qCDebug(lcWidgetFocus) << "No-op insertion." << toBeInserted << "is already after"
<< position; << position;
return false; return false;
} }
@ -13474,7 +13474,7 @@ bool QWidgetPrivate::insertIntoFocusChain(const QWidgetList &toBeInserted,
FOCUS_NEXT(last) = FOCUS_NEXT(position); FOCUS_NEXT(last) = FOCUS_NEXT(position);
FOCUS_PREV(first) = position; FOCUS_PREV(first) = position;
FOCUS_NEXT(position) = first; FOCUS_NEXT(position) = first;
qCDebug(lcFocus) << toBeInserted << "inserted after" << position; qCDebug(lcWidgetFocus) << toBeInserted << "inserted after" << position;
break; break;
} }
@ -13524,7 +13524,7 @@ QWidgetList QWidgetPrivate::takeFromFocusChain(QWidget *from,
// Check if there is a path from->to in direction // Check if there is a path from->to in direction
const QWidgetList path = focusPath(from, to , direction); const QWidgetList path = focusPath(from, to , direction);
if (path.isEmpty()) { if (path.isEmpty()) {
qCDebug(lcFocus) << "No-op removal. Focus chain from" << from << "doesn't lead to " << to; qCDebug(lcWidgetFocus) << "No-op removal. Focus chain from" << from << "doesn't lead to " << to;
return QWidgetList(); return QWidgetList();
} }
@ -13539,7 +13539,7 @@ QWidgetList QWidgetPrivate::takeFromFocusChain(QWidget *from,
FOCUS_PREV(FOCUS_NEXT(last)) = FOCUS_PREV(first); FOCUS_PREV(FOCUS_NEXT(last)) = FOCUS_PREV(first);
FOCUS_PREV(first) = last; FOCUS_PREV(first) = last;
FOCUS_NEXT(last) = first; FOCUS_NEXT(last) = first;
qCDebug(lcFocus) << path << "removed from focus chain"; qCDebug(lcWidgetFocus) << path << "removed from focus chain";
return path; return path;
} }
@ -13635,14 +13635,14 @@ bool QWidgetPrivate::isFocusChainConsistent() const
for (int i = 0; i < QApplication::allWidgets().count(); ++i) { for (int i = 0; i < QApplication::allWidgets().count(); ++i) {
if (!FOCUS_PREV(position) || !FOCUS_NEXT(position)) { if (!FOCUS_PREV(position) || !FOCUS_NEXT(position)) {
qCDebug(lcFocus) << "Nullptr found at:" << position qCDebug(lcWidgetFocus) << "Nullptr found at:" << position
<< "Previous pointing to" << FOCUS_PREV(position) << "Previous pointing to" << FOCUS_PREV(position)
<< "Next pointing to" << FOCUS_NEXT(position); << "Next pointing to" << FOCUS_NEXT(position);
return false; return false;
} }
if (!(FOCUS_PREV(FOCUS_NEXT(position)) == position if (!(FOCUS_PREV(FOCUS_NEXT(position)) == position
&& FOCUS_NEXT(FOCUS_PREV(position)) == position)) { && FOCUS_NEXT(FOCUS_PREV(position)) == position)) {
qCDebug(lcFocus) << "Inconsistent focus chain at:" << position qCDebug(lcWidgetFocus) << "Inconsistent focus chain at:" << position
<< "Previous pointing to" << FOCUS_PREV(FOCUS_NEXT(position)) << "Previous pointing to" << FOCUS_PREV(FOCUS_NEXT(position))
<< "Next pointing to" << FOCUS_NEXT(FOCUS_PREV(position)); << "Next pointing to" << FOCUS_NEXT(FOCUS_PREV(position));
return false; return false;
@ -13653,7 +13653,7 @@ bool QWidgetPrivate::isFocusChainConsistent() const
} }
qCDebug(lcFocus) << "Focus chain leading from" << q << "to" << position << "is not closed."; qCDebug(lcWidgetFocus) << "Focus chain leading from" << q << "to" << position << "is not closed.";
return false; return false;
} }