Remove "2" from Qt Quick Controls directories

Qt Quick Controls 2 was named that way because it was a follow-up to
Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer
supported, we don't need to have "2" in the name. Work on this was
already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.

By doing this renaming a few weeks before feature freeze, it won't
affect the release but still results in as little time possible spent
manually fixing conflicts in cherry-picks from non-LTS releases as a
result of the renaming.

This patch does the following:

- Renames directories.
- Adapts CMakeLists.txt and other files to account for the new paths.

A follow-up patch will handle documentation.

It does not touch library names or other user-facing stuff, as that
will have to be done in Qt 7.

Task-number: QTBUG-95413
Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 101 insertions, 0 deletions

diff --git a/src/quickcontrolsimpl/qquickmnemoniclabel.cpp b/src/quickcontrolsimpl/qquickmnemoniclabel.cpp
new file mode 100644
index 0000000000..982ffeeb66
--- /dev/null
+++ b/src/quickcontrolsimpl/qquickmnemoniclabel.cpp
@@ -0,0 +1,101 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#include "qquickmnemoniclabel_p.h"
+
+#include <QtQuick/private/qquicktext_p_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QQuickMnemonicLabel::QQuickMnemonicLabel(QQuickItem *parent)
+    : QQuickText(parent)
+{
+}
+
+QString QQuickMnemonicLabel::text() const
+{
+    return m_fullText;
+}
+
+void QQuickMnemonicLabel::setText(const QString &text)
+{
+    if (m_fullText == text)
+        return;
+
+    m_fullText = text;
+    updateMnemonic();
+}
+
+bool QQuickMnemonicLabel::isMnemonicVisible() const
+{
+    return m_mnemonicVisible;
+}
+
+void QQuickMnemonicLabel::setMnemonicVisible(bool visible)
+{
+    if (m_mnemonicVisible == visible)
+        return;
+
+    m_mnemonicVisible = visible;
+    updateMnemonic();
+
+    if (isComponentComplete())
+        forceLayout();
+}
+
+static QTextLayout::FormatRange underlineRange(int start, int length = 1)
+{
+    QTextLayout::FormatRange range;
+    range.start = start;
+    range.length = length;
+    range.format.setFontUnderline(true);
+    return range;
+}
+
+// based on QPlatformTheme::removeMnemonics()
+void QQuickMnemonicLabel::updateMnemonic()
+{
+    QString text(m_fullText.size(), QChar::Null);
+    int idx = 0;
+    int pos = 0;
+    int len = m_fullText.size();
+    QList<QTextLayout::FormatRange> formats;
+    while (len) {
+        if (m_fullText.at(pos) == QLatin1Char('&') && (len == 1 || m_fullText.at(pos + 1) != QLatin1Char('&'))) {
+            if (m_mnemonicVisible && (pos == 0 || m_fullText.at(pos - 1) != QLatin1Char('&')))
+                formats += underlineRange(pos);
+            ++pos;
+            --len;
+            if (len == 0)
+                break;
+        } else if (m_fullText.at(pos) == QLatin1Char('(') && len >= 4 &&
+                   m_fullText.at(pos + 1) == QLatin1Char('&') &&
+                   m_fullText.at(pos + 2) != QLatin1Char('&') &&
+                   m_fullText.at(pos + 3) == QLatin1Char(')')) {
+            // a mnemonic with format "\s*(&X)"
+            if (m_mnemonicVisible) {
+                formats += underlineRange(pos + 1);
+            } else {
+                int n = 0;
+                while (idx > n && text.at(idx - n - 1).isSpace())
+                    ++n;
+                idx -= n;
+                pos += 4;
+                len -= 4;
+                continue;
+            }
+        }
+        text[idx] = m_fullText.at(pos);
+        ++pos;
+        ++idx;
+        --len;
+    }
+    text.truncate(idx);
+
+    QQuickTextPrivate::get(this)->layout.setFormats(formats);
+    QQuickText::setText(text);
+}
+
+QT_END_NAMESPACE
+
+#include "moc_qquickmnemoniclabel_p.cpp"