diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qdirlisting.h | 10 | ||||
| -rw-r--r-- | src/widgets/styles/qwindowsstyle.cpp | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/corelib/io/qdirlisting.h b/src/corelib/io/qdirlisting.h index 73a13ed611f..94aec0934fb 100644 --- a/src/corelib/io/qdirlisting.h +++ b/src/corelib/io/qdirlisting.h @@ -20,6 +20,7 @@ QT_BEGIN_NAMESPACE class QDirListingPrivate; class QFileInfo; +class QDebug; class QDir; class QTimeZone; @@ -150,6 +151,10 @@ public: const_iterator constBegin() const { return begin(); } sentinel constEnd() const { return end(); } +#ifndef QT_NO_DEBUG_STREAM + Q_CORE_EXPORT friend QDebug operator<<(QDebug debug, QDirListing::IteratorFlags flags); +#endif + private: Q_DISABLE_COPY(QDirListing) @@ -160,11 +165,6 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QDirListing::IteratorFlags) -#ifndef QT_NO_DEBUG_STREAM -class QDebug; -Q_CORE_EXPORT QDebug operator<<(QDebug debug, QDirListing::IteratorFlags flags); -#endif - QT_END_NAMESPACE #endif // QDIRLISTING_H diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index bea7593ef77..916c019bcd3 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -116,8 +116,7 @@ bool QWindowsStyle::eventFilter(QObject *o, QEvent *e) // Alt has been pressed - find all widgets that care const QList<QWidget *> children = widget->findChildren<QWidget *>(); auto ignorable = [](QWidget *w) { - return w->isWindow() || !w->isVisible() - || w->style()->styleHint(SH_UnderlineShortcut, nullptr, w); + return w->isWindow() || !w->isVisible(); }; // Update states before repainting d->seenAlt.append(widget); |