summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2020-05-02 16:39:03 -0700
committerThiago Macieira <thiago.macieira@intel.com>2020-05-05 12:24:45 -0700
commitee3ab7829d0e56feb307e1dff7935d231dfade3a (patch)
tree261bed64e53fe8910cc3dc749a9f88f5d57a2e71
parent83223ca3ef5836a7015a9a4fed32a57470174151 (diff)
Fix Clang 10 warning about misleading indentation
qcombobox.cpp:3282:13: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160b5a7310c0a0d0 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-rw-r--r--src/widgets/widgets/qcombobox.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index c236ab434b..bbdbafc653 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -3213,13 +3213,13 @@ void QComboBoxPrivate::showPopupFromMouseEvent(QMouseEvent *e)
#ifdef QT_KEYPAD_NAVIGATION
//if the container already exists, then d->viewContainer() is safe to call
if (container) {
+#else
+ if (true) {
#endif
// We've restricted the next couple of lines, because by not calling
// viewContainer(), we avoid creating the QComboBoxPrivateContainer.
viewContainer()->initialClickPosition = q->mapToGlobal(e->pos());
-#ifdef QT_KEYPAD_NAVIGATION
}
-#endif
q->showPopup();
// The code below ensures that regular mousepress and pick item still works
// If it was not called the viewContainer would ignore event since it didn't have