diff options
100 files changed, 894 insertions, 763 deletions
diff --git a/examples/quick/controls/texteditor/qml/images/qt-logo.png b/examples/quick/controls/texteditor/qml/images/qt-logo.png Binary files differindex 6dedc8bf..be1bb106 100644 --- a/examples/quick/controls/texteditor/qml/images/qt-logo.png +++ b/examples/quick/controls/texteditor/qml/images/qt-logo.png diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp index 9ce73dbc..bdecf5ba 100644 --- a/examples/quick/controls/texteditor/src/documenthandler.cpp +++ b/examples/quick/controls/texteditor/src/documenthandler.cpp @@ -143,7 +143,6 @@ void DocumentHandler::saveAs(const QUrl &arg, const QString &fileType) } f.write((isHtml ? m_doc->toHtml() : m_doc->toPlainText()).toLocal8Bit()); f.close(); - qDebug() << "saved to" << localPath; setFileUrl(QUrl::fromLocalFile(localPath)); } diff --git a/examples/quick/extras/dashboard/images/fuel-icon.png b/examples/quick/extras/dashboard/images/fuel-icon.png Binary files differindex f521e905..70da758c 100644 --- a/examples/quick/extras/dashboard/images/fuel-icon.png +++ b/examples/quick/extras/dashboard/images/fuel-icon.png diff --git a/examples/quick/extras/gallery/images/center.png b/examples/quick/extras/gallery/images/center.png Binary files differindex b18a5fa8..fd369640 100644 --- a/examples/quick/extras/gallery/images/center.png +++ b/examples/quick/extras/gallery/images/center.png diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml index d943021b..eea7a737 100644 --- a/src/controls/Private/ScrollBar.qml +++ b/src/controls/Private/ScrollBar.qml @@ -101,7 +101,6 @@ Item { onExited: if (!pressed) __panel.activeControl = "none" onMouseXChanged: if (!pressed) __panel.activeControl = __panel.hitTest(mouseX, mouseY) hoverEnabled: Settings.hoverEnabled - enabled: !Settings.isMobile || !Settings.hasTouchScreen // ### Not ideal, but will usually behave as expected... preventStealing: true property var pressedX property var pressedY @@ -140,6 +139,10 @@ Item { } onPressed: { + if (mouse.source !== Qt.MouseEventNotSynthesized) { + mouse.accepted = false + return + } __panel.activeControl = __panel.hitTest(mouseX, mouseY) scrollToClickposition = scrollToClickPosition var handleRect = __panel.subControlRect("handle") diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 9e4f97e7..4841eace 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -73,10 +73,10 @@ Item { function doLayout() { if (!recursionGuard) { recursionGuard = true - scrollHelper.availableWidth = viewport.width - scrollHelper.availableHeight = viewport.height scrollHelper.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0 scrollHelper.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0 + scrollHelper.availableWidth = viewport.width + scrollHelper.availableHeight = viewport.height recursionGuard = false } } diff --git a/src/controls/Private/qquickabstractstyle.cpp b/src/controls/Private/qquickabstractstyle.cpp index 8d049614..065f7171 100644 --- a/src/controls/Private/qquickabstractstyle.cpp +++ b/src/controls/Private/qquickabstractstyle.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype AbstractStyle - \instantiates QQuickAbstractStyle + \instantiates QQuickAbstractStyle1 \qmlabstract \internal */ @@ -58,39 +58,39 @@ QT_BEGIN_NAMESPACE This grouped property holds the \c top, \c left, \c right and \c bottom padding. */ -QQuickAbstractStyle::QQuickAbstractStyle(QObject *parent) : QObject(parent) +QQuickAbstractStyle1::QQuickAbstractStyle1(QObject *parent) : QObject(parent) { } -QQmlListProperty<QObject> QQuickAbstractStyle::data() +QQmlListProperty<QObject> QQuickAbstractStyle1::data() { - return QQmlListProperty<QObject>(this, 0, &QQuickAbstractStyle::data_append, &QQuickAbstractStyle::data_count, - &QQuickAbstractStyle::data_at, &QQuickAbstractStyle::data_clear); + return QQmlListProperty<QObject>(this, 0, &QQuickAbstractStyle1::data_append, &QQuickAbstractStyle1::data_count, + &QQuickAbstractStyle1::data_at, &QQuickAbstractStyle1::data_clear); } -void QQuickAbstractStyle::data_append(QQmlListProperty<QObject> *list, QObject *object) +void QQuickAbstractStyle1::data_append(QQmlListProperty<QObject> *list, QObject *object) { - if (QQuickAbstractStyle *style = qobject_cast<QQuickAbstractStyle *>(list->object)) + if (QQuickAbstractStyle1 *style = qobject_cast<QQuickAbstractStyle1 *>(list->object)) style->m_data.append(object); } -int QQuickAbstractStyle::data_count(QQmlListProperty<QObject> *list) +int QQuickAbstractStyle1::data_count(QQmlListProperty<QObject> *list) { - if (QQuickAbstractStyle *style = qobject_cast<QQuickAbstractStyle *>(list->object)) + if (QQuickAbstractStyle1 *style = qobject_cast<QQuickAbstractStyle1 *>(list->object)) return style->m_data.count(); return 0; } -QObject *QQuickAbstractStyle::data_at(QQmlListProperty<QObject> *list, int index) +QObject *QQuickAbstractStyle1::data_at(QQmlListProperty<QObject> *list, int index) { - if (QQuickAbstractStyle *style = qobject_cast<QQuickAbstractStyle *>(list->object)) + if (QQuickAbstractStyle1 *style = qobject_cast<QQuickAbstractStyle1 *>(list->object)) return style->m_data.at(index); return 0; } -void QQuickAbstractStyle::data_clear(QQmlListProperty<QObject> *list) +void QQuickAbstractStyle1::data_clear(QQmlListProperty<QObject> *list) { - if (QQuickAbstractStyle *style = qobject_cast<QQuickAbstractStyle *>(list->object)) + if (QQuickAbstractStyle1 *style = qobject_cast<QQuickAbstractStyle1 *>(list->object)) style->m_data.clear(); } diff --git a/src/controls/Private/qquickabstractstyle_p.h b/src/controls/Private/qquickabstractstyle_p.h index 50404cfa..735c33c3 100644 --- a/src/controls/Private/qquickabstractstyle_p.h +++ b/src/controls/Private/qquickabstractstyle_p.h @@ -46,18 +46,18 @@ QT_BEGIN_NAMESPACE -class QQuickAbstractStyle : public QObject +class QQuickAbstractStyle1 : public QObject { Q_OBJECT - Q_PROPERTY(QQuickPadding* padding READ padding CONSTANT) + Q_PROPERTY(QQuickPadding1* padding READ padding CONSTANT) Q_PROPERTY(QQmlListProperty<QObject> data READ data DESIGNABLE false) Q_CLASSINFO("DefaultProperty", "data") public: - QQuickAbstractStyle(QObject *parent = 0); + QQuickAbstractStyle1(QObject *parent = 0); - QQuickPadding* padding() { return &m_padding; } + QQuickPadding1* padding() { return &m_padding; } QQmlListProperty<QObject> data(); @@ -67,7 +67,7 @@ private: static QObject *data_at(QQmlListProperty<QObject> *list, int index); static void data_clear(QQmlListProperty<QObject> *list); - QQuickPadding m_padding; + QQuickPadding1 m_padding; QList<QObject *> m_data; }; diff --git a/src/controls/Private/qquickcalendarmodel.cpp b/src/controls/Private/qquickcalendarmodel.cpp index cbef3cb1..64d52f95 100644 --- a/src/controls/Private/qquickcalendarmodel.cpp +++ b/src/controls/Private/qquickcalendarmodel.cpp @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE [03][04][05][06][07][08][09] */ -QQuickCalendarModel::QQuickCalendarModel(QObject *parent) : +QQuickCalendarModel1::QQuickCalendarModel1(QObject *parent) : QAbstractListModel(parent) { } @@ -90,7 +90,7 @@ QQuickCalendarModel::QQuickCalendarModel(QObject *parent) : We store all of the days in the month of visibleDate, as well as any days in the previous or following month if there is enough space. */ -QDate QQuickCalendarModel::visibleDate() const +QDate QQuickCalendarModel1::visibleDate() const { return mVisibleDate; } @@ -102,7 +102,7 @@ QDate QQuickCalendarModel::visibleDate() const visible date, the visible date is changed and populateFromVisibleDate() called. */ -void QQuickCalendarModel::setVisibleDate(const QDate &date) +void QQuickCalendarModel1::setVisibleDate(const QDate &date) { if (date != mVisibleDate && date.isValid()) { const QDate previousDate = mVisibleDate; @@ -137,7 +137,7 @@ void QQuickCalendarModel::setVisibleDate(const QDate &date) [30][31][01][02][03][04][05] ... */ -QLocale QQuickCalendarModel::locale() const +QLocale QQuickCalendarModel1::locale() const { return mLocale; } @@ -145,7 +145,7 @@ QLocale QQuickCalendarModel::locale() const /*! Sets the locale to \a locale. */ -void QQuickCalendarModel::setLocale(const QLocale &locale) +void QQuickCalendarModel1::setLocale(const QLocale &locale) { if (locale != mLocale) { Qt::DayOfWeek previousFirstDayOfWeek = mLocale.firstDayOfWeek(); @@ -159,19 +159,19 @@ void QQuickCalendarModel::setLocale(const QLocale &locale) } } -QVariant QQuickCalendarModel::data(const QModelIndex &index, int role) const +QVariant QQuickCalendarModel1::data(const QModelIndex &index, int role) const { if (role == DateRole) return mVisibleDates.at(index.row()); return QVariant(); } -int QQuickCalendarModel::rowCount(const QModelIndex &) const +int QQuickCalendarModel1::rowCount(const QModelIndex &) const { return mVisibleDates.isEmpty() ? 0 : weeksOnACalendarMonth * daysInAWeek; } -QHash<int, QByteArray> QQuickCalendarModel::roleNames() const +QHash<int, QByteArray> QQuickCalendarModel1::roleNames() const { QHash<int, QByteArray> names; names[DateRole] = QByteArrayLiteral("date"); @@ -181,7 +181,7 @@ QHash<int, QByteArray> QQuickCalendarModel::roleNames() const /*! Returns the date at \a index, or an invalid date if \a index is invalid. */ -QDate QQuickCalendarModel::dateAt(int index) const +QDate QQuickCalendarModel1::dateAt(int index) const { return index >= 0 && index < mVisibleDates.size() ? mVisibleDates.at(index) : QDate(); } @@ -189,7 +189,7 @@ QDate QQuickCalendarModel::dateAt(int index) const /*! Returns the index for \a date, or -1 if \a date is outside of our range. */ -int QQuickCalendarModel::indexAt(const QDate &date) +int QQuickCalendarModel1::indexAt(const QDate &date) { if (mVisibleDates.size() == 0 || date < mFirstVisibleDate || date > mLastVisibleDate) return -1; @@ -204,7 +204,7 @@ int QQuickCalendarModel::indexAt(const QDate &date) Returns the week number for the first day of the week corresponding to \a row, or -1 if \a row is outside of our range. */ -int QQuickCalendarModel::weekNumberAt(int row) const +int QQuickCalendarModel1::weekNumberAt(int row) const { const int index = row * daysInAWeek; const QDate date = dateAt(index); @@ -223,7 +223,7 @@ int QQuickCalendarModel::weekNumberAt(int row) const shown doesn't change, but the days displayed do. The \a previousDate parameter is ignored when \a force is true. */ -void QQuickCalendarModel::populateFromVisibleDate(const QDate &previousDate, bool force) +void QQuickCalendarModel1::populateFromVisibleDate(const QDate &previousDate, bool force) { // We don't need to populate if the year and month haven't changed. if (!force && mVisibleDate.year() == previousDate.year() && mVisibleDate.month() == previousDate.month()) diff --git a/src/controls/Private/qquickcalendarmodel_p.h b/src/controls/Private/qquickcalendarmodel_p.h index 5feed58a..cb47c576 100644 --- a/src/controls/Private/qquickcalendarmodel_p.h +++ b/src/controls/Private/qquickcalendarmodel_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -class QQuickCalendarModel : public QAbstractListModel +class QQuickCalendarModel1 : public QAbstractListModel { Q_OBJECT Q_PROPERTY(QDate visibleDate READ visibleDate WRITE setVisibleDate NOTIFY visibleDateChanged) @@ -56,7 +56,7 @@ class QQuickCalendarModel : public QAbstractListModel Q_PROPERTY(int count READ rowCount NOTIFY countChanged) public: - explicit QQuickCalendarModel(QObject *parent = 0); + explicit QQuickCalendarModel1(QObject *parent = 0); enum { // If this class is made public, this will have to be changed. diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index 6ced68ff..32efd332 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -83,7 +83,7 @@ static bool fromResource(const QString &path) return path.startsWith(":/"); } -bool QQuickControlSettings::hasTouchScreen() const +bool QQuickControlSettings1::hasTouchScreen() const { // QTBUG-36007 #if defined(Q_OS_ANDROID) @@ -97,7 +97,7 @@ bool QQuickControlSettings::hasTouchScreen() const #endif } -bool QQuickControlSettings::isMobile() const +bool QQuickControlSettings1::isMobile() const { #if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) || defined(Q_OS_WINRT) return true; @@ -109,17 +109,17 @@ bool QQuickControlSettings::isMobile() const #endif } -bool QQuickControlSettings::hoverEnabled() const +bool QQuickControlSettings1::hoverEnabled() const { return !isMobile() || !hasTouchScreen(); } -QString QQuickControlSettings::makeStyleComponentPath(const QString &controlStyleName, const QString &styleDirPath) +QString QQuickControlSettings1::makeStyleComponentPath(const QString &controlStyleName, const QString &styleDirPath) { return styleDirPath + QStringLiteral("/") + controlStyleName; } -QUrl QQuickControlSettings::makeStyleComponentUrl(const QString &controlStyleName, const QString &styleDirPath) +QUrl QQuickControlSettings1::makeStyleComponentUrl(const QString &controlStyleName, const QString &styleDirPath) { QString styleFilePath = makeStyleComponentPath(controlStyleName, styleDirPath); @@ -129,7 +129,7 @@ QUrl QQuickControlSettings::makeStyleComponentUrl(const QString &controlStyleNam return QUrl::fromLocalFile(styleFilePath); } -QQmlComponent *QQuickControlSettings::styleComponent(const QUrl &styleDirUrl, const QString &controlStyleName, QObject *control) +QQmlComponent *QQuickControlSettings1::styleComponent(const QUrl &styleDirUrl, const QString &controlStyleName, QObject *control) { Q_UNUSED(styleDirUrl); // required for hack that forces this function to be re-called from within QML when style changes @@ -149,6 +149,7 @@ QQmlComponent *QQuickControlSettings::styleComponent(const QUrl &styleDirUrl, co static QString relativeStyleImportPath(QQmlEngine *engine, const QString &styleName) { QString path; +#ifndef QT_STATIC bool found = false; const auto importPathList = engine->importPathList(); for (const QString &import : importPathList) { @@ -163,6 +164,11 @@ static QString relativeStyleImportPath(QQmlEngine *engine, const QString &styleN } if (!found) path = ":/QtQuick/Controls/Styles"; +#else + Q_UNUSED(engine); + Q_UNUSED(styleName); + path = ":/qt-project.org/imports/QtQuick/Controls/Styles"; +#endif return path; } @@ -175,17 +181,25 @@ static QString styleImportPath(QQmlEngine *engine, const QString &styleName) } else if (info.isRelative()) { path = relativeStyleImportPath(engine, styleName); } else { +#ifndef QT_STATIC path = info.absolutePath(); +#else + path = "qrc:/qt-project.org/imports/QtQuick/Controls/Styles"; +#endif } return path; } -QQuickControlSettings::QQuickControlSettings(QQmlEngine *engine) +QQuickControlSettings1::QQuickControlSettings1(QQmlEngine *engine) { // First, register all style paths in the default style location. QDir dir; const QString defaultStyle = defaultStyleName(); +#ifndef QT_STATIC dir.setPath(relativeStyleImportPath(engine, defaultStyle)); +#else + dir.setPath(":/qt-project.org/imports/QtQuick/Controls/Styles"); +#endif dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot); const auto list = dir.entryList(); for (const QString &styleDirectory : list) { @@ -219,7 +233,7 @@ QQuickControlSettings::QQuickControlSettings(QQmlEngine *engine) connect(this, SIGNAL(stylePathChanged()), SIGNAL(styleChanged())); } -bool QQuickControlSettings::resolveCurrentStylePath() +bool QQuickControlSettings1::resolveCurrentStylePath() { if (!m_styleMap.contains(m_name)) { qWarning() << "WARNING: Cannot find style" << m_name; @@ -255,7 +269,7 @@ bool QQuickControlSettings::resolveCurrentStylePath() return true; } -void QQuickControlSettings::findStyle(QQmlEngine *engine, const QString &styleName) +void QQuickControlSettings1::findStyle(QQmlEngine *engine, const QString &styleName) { QString path = styleImportPath(engine, styleName); QDir dir; @@ -265,6 +279,7 @@ void QQuickControlSettings::findStyle(QQmlEngine *engine, const QString &styleNa StyleData styleData; +#ifndef QT_STATIC const auto list = dir.entryList(); for (const QString &fileName : list) { // This assumes that there is only one library in the style directory, @@ -276,6 +291,7 @@ void QQuickControlSettings::findStyle(QQmlEngine *engine, const QString &styleNa break; } } +#endif // If there's no plugin for the style, then the style's files are // contained in this directory (which contains a qmldir file instead). @@ -284,7 +300,7 @@ void QQuickControlSettings::findStyle(QQmlEngine *engine, const QString &styleNa m_styleMap[styleName] = styleData; } -QUrl QQuickControlSettings::style() const +QUrl QQuickControlSettings1::style() const { QUrl result; QString path = styleFilePath(); @@ -297,12 +313,12 @@ QUrl QQuickControlSettings::style() const return result; } -QString QQuickControlSettings::styleName() const +QString QQuickControlSettings1::styleName() const { return m_name; } -void QQuickControlSettings::setStyleName(const QString &name) +void QQuickControlSettings1::setStyleName(const QString &name) { if (m_name != name) { QString oldName = m_name; @@ -316,12 +332,12 @@ void QQuickControlSettings::setStyleName(const QString &name) } } -QString QQuickControlSettings::stylePath() const +QString QQuickControlSettings1::stylePath() const { return m_path; } -void QQuickControlSettings::setStylePath(const QString &path) +void QQuickControlSettings1::setStylePath(const QString &path) { if (m_path != path) { m_path = path; @@ -329,14 +345,14 @@ void QQuickControlSettings::setStylePath(const QString &path) } } -QString QQuickControlSettings::styleFilePath() const +QString QQuickControlSettings1::styleFilePath() const { return m_path; } extern Q_GUI_EXPORT int qt_defaultDpiX(); -qreal QQuickControlSettings::dpiScaleFactor() const +qreal QQuickControlSettings1::dpiScaleFactor() const { #ifndef Q_OS_MAC return (qreal(qt_defaultDpiX()) / 96.0); @@ -344,7 +360,7 @@ qreal QQuickControlSettings::dpiScaleFactor() const return 1.0; } -qreal QQuickControlSettings::dragThreshold() const +qreal QQuickControlSettings1::dragThreshold() const { return qApp->styleHints()->startDragDistance(); } diff --git a/src/controls/Private/qquickcontrolsettings_p.h b/src/controls/Private/qquickcontrolsettings_p.h index bb857c79..aa3e4b2d 100644 --- a/src/controls/Private/qquickcontrolsettings_p.h +++ b/src/controls/Private/qquickcontrolsettings_p.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QQmlEngine; -class QQuickControlSettings : public QObject +class QQuickControlSettings1 : public QObject { Q_OBJECT Q_PROPERTY(QUrl style READ style NOTIFY styleChanged) @@ -63,7 +63,7 @@ class QQuickControlSettings : public QObject Q_PROPERTY(bool hoverEnabled READ hoverEnabled CONSTANT) public: - QQuickControlSettings(QQmlEngine *engine); + QQuickControlSettings1(QQmlEngine *engine); QUrl style() const; diff --git a/src/controls/Private/qquickcontrolsprivate.cpp b/src/controls/Private/qquickcontrolsprivate.cpp index 2f9b310b..6dd5fa2f 100644 --- a/src/controls/Private/qquickcontrolsprivate.cpp +++ b/src/controls/Private/qquickcontrolsprivate.cpp @@ -43,34 +43,34 @@ QT_BEGIN_NAMESPACE -QQuickControlsPrivateAttached::QQuickControlsPrivateAttached(QObject *attachee) +QQuickControlsPrivate1Attached::QQuickControlsPrivate1Attached(QObject *attachee) : m_attachee(qobject_cast<QQuickItem*>(attachee)) { if (m_attachee) - connect(m_attachee, &QQuickItem::windowChanged, this, &QQuickControlsPrivateAttached::windowChanged); + connect(m_attachee, &QQuickItem::windowChanged, this, &QQuickControlsPrivate1Attached::windowChanged); } -QQuickWindow *QQuickControlsPrivateAttached::window() const +QQuickWindow *QQuickControlsPrivate1Attached::window() const { return m_attachee ? m_attachee->window() : 0; } -QObject *QQuickControlsPrivate::registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine) +QObject *QQuickControlsPrivate1::registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine) { Q_UNUSED(engine); Q_UNUSED(jsEngine); - return new QQuickTooltip(); + return new QQuickTooltip1(); } -QObject *QQuickControlsPrivate::registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine) +QObject *QQuickControlsPrivate1::registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine) { Q_UNUSED(jsEngine); - return new QQuickControlSettings(engine); + return new QQuickControlSettings1(engine); } -QQuickControlsPrivateAttached *QQuickControlsPrivate::qmlAttachedProperties(QObject *object) +QQuickControlsPrivate1Attached *QQuickControlsPrivate1::qmlAttachedProperties(QObject *object) { - return new QQuickControlsPrivateAttached(object); + return new QQuickControlsPrivate1Attached(object); } QT_END_NAMESPACE diff --git a/src/controls/Private/qquickcontrolsprivate_p.h b/src/controls/Private/qquickcontrolsprivate_p.h index 52c309ef..4302f80a 100644 --- a/src/controls/Private/qquickcontrolsprivate_p.h +++ b/src/controls/Private/qquickcontrolsprivate_p.h @@ -48,13 +48,13 @@ QT_BEGIN_NAMESPACE class QQuickWindow; -class QQuickControlsPrivateAttached : public QObject +class QQuickControlsPrivate1Attached : public QObject { Q_OBJECT Q_PROPERTY(QQuickWindow* window READ window NOTIFY windowChanged) public: - QQuickControlsPrivateAttached(QObject* attachee); + QQuickControlsPrivate1Attached(QObject* attachee); QQuickWindow *window() const; @@ -65,7 +65,7 @@ private: QQuickItem* m_attachee; }; -class QQuickControlsPrivate : public QObject +class QQuickControlsPrivate1 : public QObject { Q_OBJECT @@ -73,11 +73,11 @@ public: static QObject *registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine); static QObject *registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine); - static QQuickControlsPrivateAttached *qmlAttachedProperties(QObject *object); + static QQuickControlsPrivate1Attached *qmlAttachedProperties(QObject *object); }; QT_END_NAMESPACE -QML_DECLARE_TYPEINFO(QQuickControlsPrivate, QML_HAS_ATTACHED_PROPERTIES) +QML_DECLARE_TYPEINFO(QQuickControlsPrivate1, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKCONTROLSPRIVATE_P_H diff --git a/src/controls/Private/qquickpadding_p.h b/src/controls/Private/qquickpadding_p.h index 6fe2eb38..54518b93 100644 --- a/src/controls/Private/qquickpadding_p.h +++ b/src/controls/Private/qquickpadding_p.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -class QQuickPadding : public QObject +class QQuickPadding1 : public QObject { Q_OBJECT @@ -59,7 +59,7 @@ class QQuickPadding : public QObject int m_bottom; public: - QQuickPadding(QObject *parent = 0) : + QQuickPadding1(QObject *parent = 0) : QObject(parent), m_left(0), m_top(0), diff --git a/src/controls/Private/qquickrangeddate.cpp b/src/controls/Private/qquickrangeddate.cpp index e1b3c60e..231a798a 100644 --- a/src/controls/Private/qquickrangeddate.cpp +++ b/src/controls/Private/qquickrangeddate.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_WITH_ARGS(const QDate, jsMinimumDate, (QDate(1, 1, 1))) Q_GLOBAL_STATIC_WITH_ARGS(const QDate, jsMaximumDate, (QDate(275759, 10, 25))) -QQuickRangedDate::QQuickRangedDate() : +QQuickRangedDate1::QQuickRangedDate1() : QObject(0), mDate(QDate::currentDate()), mMinimumDate(*jsMinimumDate), @@ -56,7 +56,7 @@ QQuickRangedDate::QQuickRangedDate() : /*! \internal \qmlproperty date QQuickRangedDate::date */ -void QQuickRangedDate::setDate(const QDate &date) +void QQuickRangedDate1::setDate(const QDate &date) { if (date == mDate) return; @@ -75,7 +75,7 @@ void QQuickRangedDate::setDate(const QDate &date) /*! \internal \qmlproperty date QQuickRangedDate::minimumDate */ -void QQuickRangedDate::setMinimumDate(const QDate &minimumDate) +void QQuickRangedDate1::setMinimumDate(const QDate &minimumDate) { if (minimumDate == mMinimumDate) return; @@ -93,7 +93,7 @@ void QQuickRangedDate::setMinimumDate(const QDate &minimumDate) /*! \internal \qmlproperty date QQuickRangedDate::maximumDate */ -void QQuickRangedDate::setMaximumDate(const QDate &maximumDate) +void QQuickRangedDate1::setMaximumDate(const QDate &maximumDate) { if (maximumDate == mMaximumDate) return; diff --git a/src/controls/Private/qquickrangeddate_p.h b/src/controls/Private/qquickrangeddate_p.h index b2bb3523..6ac7bc12 100644 --- a/src/controls/Private/qquickrangeddate_p.h +++ b/src/controls/Private/qquickrangeddate_p.h @@ -46,15 +46,15 @@ QT_BEGIN_NAMESPACE -class QQuickRangedDate : public QObject +class QQuickRangedDate1 : public QObject { Q_OBJECT Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY dateChanged RESET resetDate) Q_PROPERTY(QDate minimumDate READ minimumDate WRITE setMinimumDate NOTIFY minimumDateChanged RESET resetMinimumDate) Q_PROPERTY(QDate maximumDate READ maximumDate WRITE setMaximumDate NOTIFY maximumDateChanged RESET resetMaximumDate) public: - QQuickRangedDate(); - ~QQuickRangedDate() {} + QQuickRangedDate1(); + ~QQuickRangedDate1() {} QDate date() const { return mDate; } void setDate(const QDate &date); @@ -81,6 +81,6 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickRangedDate) +QML_DECLARE_TYPE(QQuickRangedDate1) #endif // QQUICKRANGEDDATE_H diff --git a/src/controls/Private/qquickrangemodel.cpp b/src/controls/Private/qquickrangemodel.cpp index ac11fe71..4a685bf3 100644 --- a/src/controls/Private/qquickrangemodel.cpp +++ b/src/controls/Private/qquickrangemodel.cpp @@ -53,16 +53,16 @@ QT_BEGIN_NAMESPACE -QQuickRangeModelPrivate::QQuickRangeModelPrivate(QQuickRangeModel *qq) +QQuickRangeModel1Private::QQuickRangeModel1Private(QQuickRangeModel1 *qq) : q_ptr(qq) { } -QQuickRangeModelPrivate::~QQuickRangeModelPrivate() +QQuickRangeModel1Private::~QQuickRangeModel1Private() { } -void QQuickRangeModelPrivate::init() +void QQuickRangeModel1Private::init() { minimum = 0; maximum = 99; @@ -81,7 +81,7 @@ void QQuickRangeModelPrivate::init() and \a position that is passed as parameter. */ -qreal QQuickRangeModelPrivate::publicPosition(qreal position) const +qreal QQuickRangeModel1Private::publicPosition(qreal position) const { // Calculate the equivalent stepSize for the position property. const qreal min = effectivePosAtMin(); @@ -122,7 +122,7 @@ qreal QQuickRangeModelPrivate::publicPosition(qreal position) const and \a value that is passed as parameter. */ -qreal QQuickRangeModelPrivate::publicValue(qreal value) const +qreal QQuickRangeModel1Private::publicValue(qreal value) const { // It is important to do value-within-range check this // late (as opposed to during setPosition()). The reason is @@ -150,9 +150,9 @@ qreal QQuickRangeModelPrivate::publicValue(qreal value) const has changed. */ -void QQuickRangeModelPrivate::emitValueAndPositionIfChanged(const qreal oldValue, const qreal oldPosition) +void QQuickRangeModel1Private::emitValueAndPositionIfChanged(const qreal oldValue, const qreal oldPosition) { - Q_Q(QQuickRangeModel); + Q_Q(QQuickRangeModel1); // Effective value and position might have changed even in cases when e.g. d->value is // unchanged. This will be the case when operating with values outside range: @@ -168,10 +168,10 @@ void QQuickRangeModelPrivate::emitValueAndPositionIfChanged(const qreal oldValue Constructs a QQuickRangeModel with \a parent */ -QQuickRangeModel::QQuickRangeModel(QObject *parent) - : QObject(parent), d_ptr(new QQuickRangeModelPrivate(this)) +QQuickRangeModel1::QQuickRangeModel1(QObject *parent) + : QObject(parent), d_ptr(new QQuickRangeModel1Private(this)) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); d->init(); } @@ -180,10 +180,10 @@ QQuickRangeModel::QQuickRangeModel(QObject *parent) Constructs a QQuickRangeModel with private class pointer \a dd and \a parent */ -QQuickRangeModel::QQuickRangeModel(QQuickRangeModelPrivate &dd, QObject *parent) +QQuickRangeModel1::QQuickRangeModel1(QQuickRangeModel1Private &dd, QObject *parent) : QObject(parent), d_ptr(&dd) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); d->init(); } @@ -191,7 +191,7 @@ QQuickRangeModel::QQuickRangeModel(QQuickRangeModelPrivate &dd, QObject *parent) Destroys the QQuickRangeModel */ -QQuickRangeModel::~QQuickRangeModel() +QQuickRangeModel1::~QQuickRangeModel1() { delete d_ptr; d_ptr = 0; @@ -203,9 +203,9 @@ QQuickRangeModel::~QQuickRangeModel() Such range is represented by \l positionAtMinimum and \l positionAtMaximum */ -void QQuickRangeModel::setPositionRange(qreal min, qreal max) +void QQuickRangeModel1::setPositionRange(qreal min, qreal max) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); bool emitPosAtMinChanged = !qFuzzyCompare(min, d->posatmin); bool emitPosAtMaxChanged = !qFuzzyCompare(max, d->posatmax); @@ -238,9 +238,9 @@ void QQuickRangeModel::setPositionRange(qreal min, qreal max) Such range is represented by \l minimumValue and \l maximumValue */ -void QQuickRangeModel::setRange(qreal min, qreal max) +void QQuickRangeModel1::setRange(qreal min, qreal max) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); bool emitMinimumChanged = !qFuzzyCompare(min, d->minimum); bool emitMaximumChanged = !qFuzzyCompare(max, d->maximum); @@ -272,15 +272,15 @@ void QQuickRangeModel::setRange(qreal min, qreal max) This property's default value is 0 */ -void QQuickRangeModel::setMinimum(qreal min) +void QQuickRangeModel1::setMinimum(qreal min) { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); setRange(min, d->maximum); } -qreal QQuickRangeModel::minimum() const +qreal QQuickRangeModel1::minimum() const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); return d->minimum; } @@ -291,17 +291,17 @@ qreal QQuickRangeModel::minimum() const This property's default value is 99 */ -void QQuickRangeModel::setMaximum(qreal max) +void QQuickRangeModel1::setMaximum(qreal max) { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); // if the new maximum value is smaller than // minimum, update minimum too setRange(qMin(d->minimum, max), max); } -qreal QQuickRangeModel::maximum() const +qreal QQuickRangeModel1::maximum() const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); return d->maximum; } @@ -313,9 +313,9 @@ qreal QQuickRangeModel::maximum() const to 30, the valid values that are going to be seen externally would be: 0, 30, 60, 90, 100. */ -void QQuickRangeModel::setStepSize(qreal stepSize) +void QQuickRangeModel1::setStepSize(qreal stepSize) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); stepSize = qMax(qreal(0.0), stepSize); if (qFuzzyCompare(stepSize, d->stepSize)) @@ -329,9 +329,9 @@ void QQuickRangeModel::setStepSize(qreal stepSize) d->emitValueAndPositionIfChanged(oldValue, oldPosition); } -qreal QQuickRangeModel::stepSize() const +qreal QQuickRangeModel1::stepSize() const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); return d->stepSize; } @@ -341,9 +341,9 @@ qreal QQuickRangeModel::stepSize() const Such calculation is based on the parameter \a value (which is valid externally). */ -qreal QQuickRangeModel::positionForValue(qreal value) const +qreal QQuickRangeModel1::positionForValue(qreal value) const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); const qreal unconstrainedPosition = d->equivalentPosition(value); return d->publicPosition(unconstrainedPosition); @@ -359,18 +359,18 @@ qreal QQuickRangeModel::positionForValue(qreal value) const since it can become valid if the user changes the position range later. */ -qreal QQuickRangeModel::position() const +qreal QQuickRangeModel1::position() const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); // Return the internal position but observe boundaries and // stepSize restrictions. return d->publicPosition(d->pos); } -void QQuickRangeModel::setPosition(qreal newPosition) +void QQuickRangeModel1::setPosition(qreal newPosition) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); if (qFuzzyCompare(newPosition, d->pos)) return; @@ -391,15 +391,15 @@ void QQuickRangeModel::setPosition(qreal newPosition) This property's default value is 0 */ -void QQuickRangeModel::setPositionAtMinimum(qreal min) +void QQuickRangeModel1::setPositionAtMinimum(qreal min) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); setPositionRange(min, d->posatmax); } -qreal QQuickRangeModel::positionAtMinimum() const +qreal QQuickRangeModel1::positionAtMinimum() const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); return d->posatmin; } @@ -410,15 +410,15 @@ qreal QQuickRangeModel::positionAtMinimum() const This property's default value is 0 */ -void QQuickRangeModel::setPositionAtMaximum(qreal max) +void QQuickRangeModel1::setPositionAtMaximum(qreal max) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); setPositionRange(d->posatmin, max); } -qreal QQuickRangeModel::positionAtMaximum() const +qreal QQuickRangeModel1::positionAtMaximum() const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); return d->posatmax; } @@ -428,9 +428,9 @@ qreal QQuickRangeModel::positionAtMaximum() const Such calculation is based on the parameter \a position (which is valid externally). */ -qreal QQuickRangeModel::valueForPosition(qreal position) const +qreal QQuickRangeModel1::valueForPosition(qreal position) const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); const qreal unconstrainedValue = d->equivalentValue(position); return d->publicValue(unconstrainedValue); @@ -446,18 +446,18 @@ qreal QQuickRangeModel::valueForPosition(qreal position) const since it can become valid if the user changes the range later. */ -qreal QQuickRangeModel::value() const +qreal QQuickRangeModel1::value() const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); // Return internal value but observe boundaries and // stepSize restrictions return d->publicValue(d->value); } -void QQuickRangeModel::setValue(qreal newValue) +void QQuickRangeModel1::setValue(qreal newValue) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); if (qFuzzyCompare(newValue, d->value)) return; @@ -480,9 +480,9 @@ void QQuickRangeModel::setValue(qreal newValue) minimum (represented by \l positionAtMinimum). */ -void QQuickRangeModel::setInverted(bool inverted) +void QQuickRangeModel1::setInverted(bool inverted) { - Q_D(QQuickRangeModel); + Q_D(QQuickRangeModel1); if (inverted == d->inverted) return; @@ -493,9 +493,9 @@ void QQuickRangeModel::setInverted(bool inverted) setPosition(d->equivalentPosition(d->value)); } -bool QQuickRangeModel::inverted() const +bool QQuickRangeModel1::inverted() const { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); return d->inverted; } @@ -503,9 +503,9 @@ bool QQuickRangeModel::inverted() const Sets the \l value to \l minimumValue. */ -void QQuickRangeModel::toMinimum() +void QQuickRangeModel1::toMinimum() { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); setValue(d->minimum); } @@ -513,24 +513,24 @@ void QQuickRangeModel::toMinimum() Sets the \l value to \l maximumValue. */ -void QQuickRangeModel::toMaximum() +void QQuickRangeModel1::toMaximum() { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); setValue(d->maximum); } -void QQuickRangeModel::increaseSingleStep() +void QQuickRangeModel1::increaseSingleStep() { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); if (qFuzzyIsNull(d->stepSize)) setValue(value() + (d->maximum - d->minimum)/10.0); else setValue(value() + d->stepSize); } -void QQuickRangeModel::decreaseSingleStep() +void QQuickRangeModel1::decreaseSingleStep() { - Q_D(const QQuickRangeModel); + Q_D(const QQuickRangeModel1); if (qFuzzyIsNull(d->stepSize)) setValue(value() - (d->maximum - d->minimum)/10.0); else diff --git a/src/controls/Private/qquickrangemodel_p.h b/src/controls/Private/qquickrangemodel_p.h index 6e82b009..0c93bed3 100644 --- a/src/controls/Private/qquickrangemodel_p.h +++ b/src/controls/Private/qquickrangemodel_p.h @@ -45,9 +45,9 @@ QT_BEGIN_NAMESPACE -class QQuickRangeModelPrivate; +class QQuickRangeModel1Private; -class QQuickRangeModel : public QObject +class QQuickRangeModel1 : public QObject { Q_OBJECT Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged USER true) @@ -60,8 +60,8 @@ class QQuickRangeModel : public QObject Q_PROPERTY(bool inverted READ inverted WRITE setInverted NOTIFY invertedChanged) public: - QQuickRangeModel(QObject *parent = 0); - virtual ~QQuickRangeModel(); + QQuickRangeModel1(QObject *parent = 0); + virtual ~QQuickRangeModel1(); void setRange(qreal min, qreal max); void setPositionRange(qreal min, qreal max); @@ -112,17 +112,17 @@ Q_SIGNALS: void positionAtMaximumChanged(qreal max); protected: - QQuickRangeModel(QQuickRangeModelPrivate &dd, QObject *parent); - QQuickRangeModelPrivate* d_ptr; + QQuickRangeModel1(QQuickRangeModel1Private &dd, QObject *parent); + QQuickRangeModel1Private* d_ptr; private: - Q_DISABLE_COPY(QQuickRangeModel) - Q_DECLARE_PRIVATE(QQuickRangeModel) + Q_DISABLE_COPY(QQuickRangeModel1) + Q_DECLARE_PRIVATE(QQuickRangeModel1) }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickRangeModel) +QML_DECLARE_TYPE(QQuickRangeModel1) #endif // QQUICKRANGEMODEL_P_H diff --git a/src/controls/Private/qquickrangemodel_p_p.h b/src/controls/Private/qquickrangemodel_p_p.h index 8bd57e5b..5c56814e 100644 --- a/src/controls/Private/qquickrangemodel_p_p.h +++ b/src/controls/Private/qquickrangemodel_p_p.h @@ -55,12 +55,12 @@ QT_BEGIN_NAMESPACE -class QQuickRangeModelPrivate +class QQuickRangeModel1Private { - Q_DECLARE_PUBLIC(QQuickRangeModel) + Q_DECLARE_PUBLIC(QQuickRangeModel1) public: - QQuickRangeModelPrivate(QQuickRangeModel *qq); - virtual ~QQuickRangeModelPrivate(); + QQuickRangeModel1Private(QQuickRangeModel1 *qq); + virtual ~QQuickRangeModel1Private(); void init(); @@ -69,7 +69,7 @@ public: uint inverted : 1; - QQuickRangeModel *q_ptr; + QQuickRangeModel1 *q_ptr; inline qreal effectivePosAtMin() const { return inverted ? posatmax : posatmin; diff --git a/src/controls/Private/qquicksceneposlistener.cpp b/src/controls/Private/qquicksceneposlistener.cpp index c829b344..4e5a4a5e 100644 --- a/src/controls/Private/qquicksceneposlistener.cpp +++ b/src/controls/Private/qquicksceneposlistener.cpp @@ -50,14 +50,14 @@ static const QQuickItemPrivate::ChangeTypes ItemChangeTypes = QQuickItemPrivate: | QQuickItemPrivate::Parent | QQuickItemPrivate::Destroyed; -QQuickScenePosListener::QQuickScenePosListener(QObject *parent) +QQuickScenePosListener1::QQuickScenePosListener1(QObject *parent) : QObject(parent) , m_enabled(false) , m_item(0) { } -QQuickScenePosListener::~QQuickScenePosListener() +QQuickScenePosListener1::~QQuickScenePosListener1() { if (m_item == 0) return; @@ -66,12 +66,12 @@ QQuickScenePosListener::~QQuickScenePosListener() removeAncestorListeners(m_item->parentItem()); } -QQuickItem *QQuickScenePosListener::item() const +QQuickItem *QQuickScenePosListener1::item() const { return m_item; } -void QQuickScenePosListener::setItem(QQuickItem *item) +void QQuickScenePosListener1::setItem(QQuickItem *item) { if (m_item == item) return; @@ -94,17 +94,17 @@ void QQuickScenePosListener::setItem(QQuickItem *item) updateScenePos(); } -QPointF QQuickScenePosListener::scenePos() const +QPointF QQuickScenePosListener1::scenePos() const { return m_scenePos; } -bool QQuickScenePosListener::isEnabled() const +bool QQuickScenePosListener1::isEnabled() const { return m_enabled; } -void QQuickScenePosListener::setEnabled(bool enabled) +void QQuickScenePosListener1::setEnabled(bool enabled) { if (m_enabled == enabled) return; @@ -124,23 +124,23 @@ void QQuickScenePosListener::setEnabled(bool enabled) emit enabledChanged(); } -void QQuickScenePosListener::itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &) +void QQuickScenePosListener1::itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &) { updateScenePos(); } -void QQuickScenePosListener::itemParentChanged(QQuickItem *, QQuickItem *parent) +void QQuickScenePosListener1::itemParentChanged(QQuickItem *, QQuickItem *parent) { addAncestorListeners(parent); } -void QQuickScenePosListener::itemChildRemoved(QQuickItem *, QQuickItem *child) +void QQuickScenePosListener1::itemChildRemoved(QQuickItem *, QQuickItem *child) { if (isAncestor(child)) removeAncestorListeners(child); } -void QQuickScenePosListener::itemDestroyed(QQuickItem *item) +void QQuickScenePosListener1::itemDestroyed(QQuickItem *item) { Q_ASSERT(m_item == item); @@ -150,7 +150,7 @@ void QQuickScenePosListener::itemDestroyed(QQuickItem *item) removeAncestorListeners(item->parentItem()); } -void QQuickScenePosListener::updateScenePos() +void QQuickScenePosListener1::updateScenePos() { const QPointF &scenePos = m_item->mapToScene(QPointF(0, 0)); if (m_scenePos != scenePos) { @@ -164,7 +164,7 @@ void QQuickScenePosListener::updateScenePos() Remove this listener from \a item and all its ancestors. */ -void QQuickScenePosListener::removeAncestorListeners(QQuickItem *item) +void QQuickScenePosListener1::removeAncestorListeners(QQuickItem *item) { if (item == m_item) return; @@ -181,7 +181,7 @@ void QQuickScenePosListener::removeAncestorListeners(QQuickItem *item) Injects this as a listener to \a item and all its ancestors. */ -void QQuickScenePosListener::addAncestorListeners(QQuickItem *item) +void QQuickScenePosListener1::addAncestorListeners(QQuickItem *item) { if (item == m_item) return; @@ -193,7 +193,7 @@ void QQuickScenePosListener::addAncestorListeners(QQuickItem *item) } } -bool QQuickScenePosListener::isAncestor(QQuickItem *item) const +bool QQuickScenePosListener1::isAncestor(QQuickItem *item) const { if (!m_item) return false; diff --git a/src/controls/Private/qquicksceneposlistener_p.h b/src/controls/Private/qquicksceneposlistener_p.h index f35ab75e..f66930e7 100644 --- a/src/controls/Private/qquicksceneposlistener_p.h +++ b/src/controls/Private/qquicksceneposlistener_p.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QQuickItem; -class QQuickScenePosListener : public QObject, public QQuickItemChangeListener +class QQuickScenePosListener1 : public QObject, public QQuickItemChangeListener { Q_OBJECT Q_PROPERTY(QQuickItem *item READ item WRITE setItem FINAL) @@ -57,8 +57,8 @@ class QQuickScenePosListener : public QObject, public QQuickItemChangeListener Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL) public: - explicit QQuickScenePosListener(QObject *parent = 0); - ~QQuickScenePosListener(); + explicit QQuickScenePosListener1(QObject *parent = 0); + ~QQuickScenePosListener1(); QQuickItem *item() const; void setItem(QQuickItem *item); diff --git a/src/controls/Private/qquickspinboxvalidator.cpp b/src/controls/Private/qquickspinboxvalidator.cpp index 895c85bb..6723defe 100644 --- a/src/controls/Private/qquickspinboxvalidator.cpp +++ b/src/controls/Private/qquickspinboxvalidator.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -QQuickSpinBoxValidator::QQuickSpinBoxValidator(QObject *parent) +QQuickSpinBoxValidator1::QQuickSpinBoxValidator1(QObject *parent) : QValidator(parent), m_value(0), m_step(1), m_initialized(false) { m_validator.setTop(99); @@ -61,21 +61,21 @@ QQuickSpinBoxValidator::QQuickSpinBoxValidator(QObject *parent) connect(this, SIGNAL(suffixChanged()), this, SIGNAL(textChanged())); } -QQuickSpinBoxValidator::~QQuickSpinBoxValidator() +QQuickSpinBoxValidator1::~QQuickSpinBoxValidator1() { } -QString QQuickSpinBoxValidator::text() const +QString QQuickSpinBoxValidator1::text() const { return textFromValue(m_value); } -qreal QQuickSpinBoxValidator::value() const +qreal QQuickSpinBoxValidator1::value() const { return m_value; } -void QQuickSpinBoxValidator::setValue(qreal value) +void QQuickSpinBoxValidator1::setValue(qreal value) { if (m_initialized) { value = qBound(minimumValue(), value, maximumValue()); @@ -90,12 +90,12 @@ void QQuickSpinBoxValidator::setValue(qreal value) } } -qreal QQuickSpinBoxValidator::minimumValue() const +qreal QQuickSpinBoxValidator1::minimumValue() const { return m_validator.bottom(); } -void QQuickSpinBoxValidator::setMinimumValue(qreal min) +void QQuickSpinBoxValidator1::setMinimumValue(qreal min) { if (min != m_validator.bottom()) { m_validator.setBottom(min); @@ -105,12 +105,12 @@ void QQuickSpinBoxValidator::setMinimumValue(qreal min) } } -qreal QQuickSpinBoxValidator::maximumValue() const +qreal QQuickSpinBoxValidator1::maximumValue() const { return m_validator.top(); } -void QQuickSpinBoxValidator::setMaximumValue(qreal max) +void QQuickSpinBoxValidator1::setMaximumValue(qreal max) { if (max != m_validator.top()) { m_validator.setTop(max); @@ -120,12 +120,12 @@ void QQuickSpinBoxValidator::setMaximumValue(qreal max) } } -int QQuickSpinBoxValidator::decimals() const +int QQuickSpinBoxValidator1::decimals() const { return m_validator.decimals(); } -void QQuickSpinBoxValidator::setDecimals(int decimals) +void QQuickSpinBoxValidator1::setDecimals(int decimals) { if (decimals != m_validator.decimals()) { m_validator.setDecimals(decimals); @@ -135,12 +135,12 @@ void QQuickSpinBoxValidator::setDecimals(int decimals) } } -qreal QQuickSpinBoxValidator::stepSize() const +qreal QQuickSpinBoxValidator1::stepSize() const { return m_step; } -void QQuickSpinBoxValidator::setStepSize(qreal step) +void QQuickSpinBoxValidator1::setStepSize(qreal step) { if (m_step != step) { m_step = step; @@ -148,12 +148,12 @@ void QQuickSpinBoxValidator::setStepSize(qreal step) } } -QString QQuickSpinBoxValidator::prefix() const +QString QQuickSpinBoxValidator1::prefix() const { return m_prefix; } -void QQuickSpinBoxValidator::setPrefix(const QString &prefix) +void QQuickSpinBoxValidator1::setPrefix(const QString &prefix) { if (m_prefix != prefix) { m_prefix = prefix; @@ -161,12 +161,12 @@ void QQuickSpinBoxValidator::setPrefix(const QString &prefix) } } -QString QQuickSpinBoxValidator::suffix() const +QString QQuickSpinBoxValidator1::suffix() const { return m_suffix; } -void QQuickSpinBoxValidator::setSuffix(const QString &suffix) +void QQuickSpinBoxValidator1::setSuffix(const QString &suffix) { if (m_suffix != suffix) { m_suffix = suffix; @@ -174,12 +174,12 @@ void QQuickSpinBoxValidator::setSuffix(const QString &suffix) } } -void QQuickSpinBoxValidator::fixup(QString &input) const +void QQuickSpinBoxValidator1::fixup(QString &input) const { input = textFromValue(m_value).remove(locale().groupSeparator()); } -QValidator::State QQuickSpinBoxValidator::validate(QString &input, int &pos) const +QValidator::State QQuickSpinBoxValidator1::validate(QString &input, int &pos) const { if (pos > 0 && pos < input.length()) { if (input.at(pos - 1) == locale().groupSeparator()) @@ -209,7 +209,7 @@ QValidator::State QQuickSpinBoxValidator::validate(QString &input, int &pos) con if (state == QValidator::Acceptable || (state == QValidator::Intermediate && val >= 0 && val <= m_validator.top()) || (state == QValidator::Intermediate && val < 0 && val >= m_validator.bottom())) { - const_cast<QQuickSpinBoxValidator *>(this)->setValue(val); + const_cast<QQuickSpinBoxValidator1 *>(this)->setValue(val); if (input != textFromValue(val)) state = QValidator::Intermediate; } else if (val < m_validator.bottom() || val > m_validator.top()) { @@ -220,23 +220,23 @@ QValidator::State QQuickSpinBoxValidator::validate(QString &input, int &pos) con return state; } -void QQuickSpinBoxValidator::componentComplete() +void QQuickSpinBoxValidator1::componentComplete() { m_initialized = true; setValue(m_value); } -void QQuickSpinBoxValidator::increment() +void QQuickSpinBoxValidator1::increment() { setValue(m_value + m_step); } -void QQuickSpinBoxValidator::decrement() +void QQuickSpinBoxValidator1::decrement() { setValue(m_value - m_step); } -QString QQuickSpinBoxValidator::textFromValue(qreal value) const +QString QQuickSpinBoxValidator1::textFromValue(qreal value) const { return m_prefix + locale().toString(value, 'f', m_validator.decimals()) + m_suffix; } diff --git a/src/controls/Private/qquickspinboxvalidator_p.h b/src/controls/Private/qquickspinboxvalidator_p.h index 8de18410..7ca6901e 100644 --- a/src/controls/Private/qquickspinboxvalidator_p.h +++ b/src/controls/Private/qquickspinboxvalidator_p.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -class QQuickSpinBoxValidator : public QValidator, public QQmlParserStatus +class QQuickSpinBoxValidator1 : public QValidator, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -59,8 +59,8 @@ class QQuickSpinBoxValidator : public QValidator, public QQmlParserStatus Q_PROPERTY(QString suffix READ suffix WRITE setSuffix NOTIFY suffixChanged) public: - explicit QQuickSpinBoxValidator(QObject *parent = 0); - virtual ~QQuickSpinBoxValidator(); + explicit QQuickSpinBoxValidator1(QObject *parent = 0); + virtual ~QQuickSpinBoxValidator1(); QString text() const; @@ -116,11 +116,11 @@ private: bool m_initialized; QDoubleValidator m_validator; - Q_DISABLE_COPY(QQuickSpinBoxValidator) + Q_DISABLE_COPY(QQuickSpinBoxValidator1) }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSpinBoxValidator) +QML_DECLARE_TYPE(QQuickSpinBoxValidator1) #endif // QQUICKSPINBOXVALIDATOR_P_H diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index c3f579ab..79fba8be 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -96,10 +96,10 @@ CGContextRef qt_mac_cg_context(const QPaintDevice *pdev) #endif -class QQuickStyleNode : public QSGNinePatchNode +class QQuickStyleNode1 : public QSGNinePatchNode { public: - QQuickStyleNode() + QQuickStyleNode1() : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4) { m_geometry.setDrawingMode(GL_TRIANGLE_STRIP); @@ -109,7 +109,7 @@ public: setMaterial(&m_material); } - ~QQuickStyleNode() + ~QQuickStyleNode1() { delete m_material.texture(); } @@ -212,7 +212,7 @@ public: QSGTextureMaterial m_material; }; -QQuickStyleItem::QQuickStyleItem(QQuickItem *parent) +QQuickStyleItem1::QQuickStyleItem1(QQuickItem *parent) : QQuickItem(parent), m_styleoption(0), m_itemType(Undefined), @@ -275,13 +275,13 @@ QQuickStyleItem::QQuickStyleItem(QQuickItem *parent) connect(this, SIGNAL(contentHeightChanged(int)), this, SLOT(updateBaselineOffset())); } -QQuickStyleItem::~QQuickStyleItem() +QQuickStyleItem1::~QQuickStyleItem1() { delete m_styleoption; m_styleoption = 0; } -void QQuickStyleItem::initStyleOption() +void QQuickStyleItem1::initStyleOption() { QString type = elementType(); if (m_styleoption) @@ -552,19 +552,19 @@ void QQuickStyleItem::initStyleOption() // For GTK style. See below, in setElementType() setProperty("_q_isComboBoxPopupItem", m_itemType == ComboBoxItem); - QQuickMenuItemType::MenuItemType type = - static_cast<QQuickMenuItemType::MenuItemType>(m_properties[QStringLiteral("type")].toInt()); - if (type == QQuickMenuItemType::ScrollIndicator) { + QQuickMenuItemType1::MenuItemType type = + static_cast<QQuickMenuItemType1::MenuItemType>(m_properties[QStringLiteral("type")].toInt()); + if (type == QQuickMenuItemType1::ScrollIndicator) { int scrollerDirection = m_properties[QStringLiteral("scrollerDirection")].toInt(); opt->menuItemType = QStyleOptionMenuItem::Scroller; opt->state |= scrollerDirection == Qt::UpArrow ? QStyle::State_UpArrow : QStyle::State_DownArrow; - } else if (type == QQuickMenuItemType::Separator) { + } else if (type == QQuickMenuItemType1::Separator) { opt->menuItemType = QStyleOptionMenuItem::Separator; } else { opt->text = text(); - if (type == QQuickMenuItemType::Menu) { + if (type == QQuickMenuItemType1::Menu) { opt->menuItemType = QStyleOptionMenuItem::SubMenu; } else { opt->menuItemType = QStyleOptionMenuItem::Normal; @@ -817,7 +817,7 @@ void QQuickStyleItem::initStyleOption() } -void QQuickStyleItem::resolvePalette() +void QQuickStyleItem1::resolvePalette() { if (QCoreApplication::testAttribute(Qt::AA_SetPalette)) return; @@ -886,7 +886,7 @@ void QQuickStyleItem::resolvePalette() * QFusionStyle = "fusion" */ -QString QQuickStyleItem::style() const +QString QQuickStyleItem1::style() const { QString style = qApp->style()->metaObject()->className(); style = style.toLower(); @@ -897,7 +897,7 @@ QString QQuickStyleItem::style() const return style; } -QString QQuickStyleItem::hitTest(int px, int py) +QString QQuickStyleItem1::hitTest(int px, int py) { QStyle::SubControl subcontrol = QStyle::SC_All; switch (m_itemType) { @@ -953,7 +953,7 @@ QString QQuickStyleItem::hitTest(int px, int py) return QStringLiteral("none"); } -QSize QQuickStyleItem::sizeFromContents(int width, int height) +QSize QQuickStyleItem1::sizeFromContents(int width, int height) { initStyleOption(); @@ -1111,7 +1111,7 @@ QSize QQuickStyleItem::sizeFromContents(int width, int height) } return size; } -qreal QQuickStyleItem::baselineOffset() +qreal QQuickStyleItem1::baselineOffset() { QRect r; bool ceilResult = true; // By default baseline offset rounding is done upwards @@ -1172,14 +1172,14 @@ qreal QQuickStyleItem::baselineOffset() return 0.; } -void QQuickStyleItem::updateBaselineOffset() +void QQuickStyleItem1::updateBaselineOffset() { const qreal baseline = baselineOffset(); if (baseline > 0) setBaselineOffset(baseline); } -void QQuickStyleItem::setContentWidth(int arg) +void QQuickStyleItem1::setContentWidth(int arg) { if (m_contentWidth != arg) { m_contentWidth = arg; @@ -1187,7 +1187,7 @@ void QQuickStyleItem::setContentWidth(int arg) } } -void QQuickStyleItem::setContentHeight(int arg) +void QQuickStyleItem1::setContentHeight(int arg) { if (m_contentHeight != arg) { m_contentHeight = arg; @@ -1195,20 +1195,20 @@ void QQuickStyleItem::setContentHeight(int arg) } } -void QQuickStyleItem::updateSizeHint() +void QQuickStyleItem1::updateSizeHint() { QSize implicitSize = sizeFromContents(m_contentWidth, m_contentHeight); setImplicitSize(implicitSize.width(), implicitSize.height()); } -void QQuickStyleItem::updateRect() +void QQuickStyleItem1::updateRect() { initStyleOption(); m_styleoption->rect.setWidth(width()); m_styleoption->rect.setHeight(height()); } -int QQuickStyleItem::pixelMetric(const QString &metric) +int QQuickStyleItem1::pixelMetric(const QString &metric) { if (metric == QLatin1String("scrollbarExtent")) @@ -1256,7 +1256,7 @@ int QQuickStyleItem::pixelMetric(const QString &metric) return 0; } -QVariant QQuickStyleItem::styleHint(const QString &metric) +QVariant QQuickStyleItem1::styleHint(const QString &metric) { initStyleOption(); if (metric == QLatin1String("comboboxpopup")) { @@ -1289,7 +1289,7 @@ QVariant QQuickStyleItem::styleHint(const QString &metric) // Add SH_Menu_SpaceActivatesItem } -void QQuickStyleItem::setHints(const QVariantMap &str) +void QQuickStyleItem1::setHints(const QVariantMap &str) { if (m_hints != str) { m_hints = str; @@ -1307,13 +1307,13 @@ void QQuickStyleItem::setHints(const QVariantMap &str) } } -void QQuickStyleItem::resetHints() +void QQuickStyleItem1::resetHints() { m_hints.clear(); } -void QQuickStyleItem::setElementType(const QString &str) +void QQuickStyleItem1::setElementType(const QString &str) { if (m_type == str) return; @@ -1404,7 +1404,7 @@ void QQuickStyleItem::setElementType(const QString &str) updateSizeHint(); } -QRectF QQuickStyleItem::subControlRect(const QString &subcontrolString) +QRectF QQuickStyleItem1::subControlRect(const QString &subcontrolString) { QStyle::SubControl subcontrol = QStyle::SC_None; initStyleOption(); @@ -1468,9 +1468,9 @@ QRectF QQuickStyleItem::subControlRect(const QString &subcontrolString) } namespace { -class QHighDpiPixmapsEnabler { +class QHighDpiPixmapsEnabler1 { public: - QHighDpiPixmapsEnabler() + QHighDpiPixmapsEnabler1() :wasEnabled(false) { if (!qApp->testAttribute(Qt::AA_UseHighDpiPixmaps)) { @@ -1479,7 +1479,7 @@ public: } } - ~QHighDpiPixmapsEnabler() + ~QHighDpiPixmapsEnabler1() { if (wasEnabled) qApp->setAttribute(Qt::AA_UseHighDpiPixmaps, false); @@ -1489,7 +1489,7 @@ private: }; } -void QQuickStyleItem::paint(QPainter *painter) +void QQuickStyleItem1::paint(QPainter *painter) { initStyleOption(); if (QStyleOptionMenuItem *opt = qstyleoption_cast<QStyleOptionMenuItem*>(m_styleoption)) @@ -1506,7 +1506,7 @@ void QQuickStyleItem::paint(QPainter *painter) // Set AA_UseHighDpiPixmaps when calling style code to make QIcon return // "retina" pixmaps. The flag is controlled by the application so we can't // set it unconditinally. - QHighDpiPixmapsEnabler enabler; + QHighDpiPixmapsEnabler1 enabler; switch (m_itemType) { case Button: @@ -1765,30 +1765,30 @@ void QQuickStyleItem::paint(QPainter *painter) } } -qreal QQuickStyleItem::textWidth(const QString &text) +qreal QQuickStyleItem1::textWidth(const QString &text) { QFontMetricsF fm = QFontMetricsF(m_styleoption->fontMetrics); return fm.boundingRect(text).width(); } -qreal QQuickStyleItem::textHeight(const QString &text) +qreal QQuickStyleItem1::textHeight(const QString &text) { QFontMetricsF fm = QFontMetricsF(m_styleoption->fontMetrics); return text.isEmpty() ? fm.height() : fm.boundingRect(text).height(); } -QString QQuickStyleItem::elidedText(const QString &text, int elideMode, int width) +QString QQuickStyleItem1::elidedText(const QString &text, int elideMode, int width) { return m_styleoption->fontMetrics.elidedText(text, Qt::TextElideMode(elideMode), width); } -bool QQuickStyleItem::hasThemeIcon(const QString &icon) const +bool QQuickStyleItem1::hasThemeIcon(const QString &icon) const { return QIcon::hasThemeIcon(icon); } -bool QQuickStyleItem::event(QEvent *ev) +bool QQuickStyleItem1::event(QEvent *ev) { if (ev->type() == QEvent::StyleAnimationUpdate) { if (isVisible()) { @@ -1803,7 +1803,7 @@ bool QQuickStyleItem::event(QEvent *ev) return QQuickItem::event(ev); } -void QQuickStyleItem::setTextureWidth(int w) +void QQuickStyleItem1::setTextureWidth(int w) { if (m_textureWidth == w) return; @@ -1812,7 +1812,7 @@ void QQuickStyleItem::setTextureWidth(int w) update(); } -void QQuickStyleItem::setTextureHeight(int h) +void QQuickStyleItem1::setTextureHeight(int h) { if (m_textureHeight == h) return; @@ -1821,7 +1821,7 @@ void QQuickStyleItem::setTextureHeight(int h) update(); } -QSGNode *QQuickStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) +QSGNode *QQuickStyleItem1::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) { if (m_image.isNull()) { delete node; @@ -1832,7 +1832,7 @@ QSGNode *QQuickStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) if (!styleNode) { styleNode = QQuickItemPrivate::get(this)->sceneGraphContext()->createNinePatchNode(); if (!styleNode) - styleNode = new QQuickStyleNode; + styleNode = new QQuickStyleNode1; } #ifdef QSG_RUNTIME_DESCRIPTION @@ -1852,7 +1852,7 @@ QSGNode *QQuickStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) return styleNode; } -void QQuickStyleItem::updatePolish() +void QQuickStyleItem1::updatePolish() { if (width() >= 1 && height() >= 1) { // Note these are reals so 1 pixel is minimum float devicePixelRatio = window() ? window()->devicePixelRatio() : qApp->devicePixelRatio(); @@ -1871,7 +1871,7 @@ void QQuickStyleItem::updatePolish() } } -QPixmap QQuickTableRowImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) +QPixmap QQuickTableRowImageProvider1::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) { Q_UNUSED (requestedSize); int width = 16; diff --git a/src/controls/Private/qquickstyleitem_p.h b/src/controls/Private/qquickstyleitem_p.h index 1cc27ca0..19cc15cf 100644 --- a/src/controls/Private/qquickstyleitem_p.h +++ b/src/controls/Private/qquickstyleitem_p.h @@ -50,19 +50,19 @@ QT_BEGIN_NAMESPACE class QWidget; class QStyleOption; -class QQuickTableRowImageProvider : public QQuickImageProvider +class QQuickTableRowImageProvider1 : public QQuickImageProvider { public: - QQuickTableRowImageProvider() + QQuickTableRowImageProvider1() : QQuickImageProvider(QQuickImageProvider::Pixmap) {} QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize); }; -class QQuickStyleItem: public QQuickItem +class QQuickStyleItem1: public QQuickItem { Q_OBJECT - Q_PROPERTY(QQuickPadding* border READ border CONSTANT) + Q_PROPERTY(QQuickPadding1* border READ border CONSTANT) Q_PROPERTY( bool sunken READ sunken WRITE setSunken NOTIFY sunkenChanged) Q_PROPERTY( bool raised READ raised WRITE setRaised NOTIFY raisedChanged) @@ -95,11 +95,11 @@ class QQuickStyleItem: public QQuickItem Q_PROPERTY( int textureWidth READ textureWidth WRITE setTextureWidth NOTIFY textureWidthChanged) Q_PROPERTY( int textureHeight READ textureHeight WRITE setTextureHeight NOTIFY textureHeightChanged) - QQuickPadding* border() { return &m_border; } + QQuickPadding1* border() { return &m_border; } public: - QQuickStyleItem(QQuickItem *parent = 0); - ~QQuickStyleItem(); + QQuickStyleItem1(QQuickItem *parent = 0); + ~QQuickStyleItem1(); enum Type { Undefined, @@ -289,7 +289,7 @@ protected: int m_textureHeight; QImage m_image; - QQuickPadding m_border; + QQuickPadding1 m_border; }; QT_END_NAMESPACE diff --git a/src/controls/Private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp index 12a31381..aa09ea6b 100644 --- a/src/controls/Private/qquicktooltip.cpp +++ b/src/controls/Private/qquicktooltip.cpp @@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE -QQuickTooltip::QQuickTooltip(QObject *parent) +QQuickTooltip1::QQuickTooltip1(QObject *parent) : QObject(parent) { } -void QQuickTooltip::showText(QQuickItem *item, const QPointF &pos, const QString &str) +void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QString &str) { if (!item || !item->window()) return; @@ -78,7 +78,7 @@ void QQuickTooltip::showText(QQuickItem *item, const QPointF &pos, const QString #endif } -void QQuickTooltip::hideText() +void QQuickTooltip1::hideText() { #ifdef QT_WIDGETS_LIB QToolTip::hideText(); diff --git a/src/controls/Private/qquicktooltip_p.h b/src/controls/Private/qquicktooltip_p.h index 7ed57299..5b3cf919 100644 --- a/src/controls/Private/qquicktooltip_p.h +++ b/src/controls/Private/qquicktooltip_p.h @@ -47,12 +47,12 @@ QT_BEGIN_NAMESPACE class QPointF; class QQuickItem; -class QQuickTooltip : public QObject +class QQuickTooltip1 : public QObject { Q_OBJECT public: - QQuickTooltip(QObject *parent = 0); + QQuickTooltip1(QObject *parent = 0); Q_INVOKABLE void showText(QQuickItem *item, const QPointF &pos, const QString &text); Q_INVOKABLE void hideText(); diff --git a/src/controls/Private/qquicktreemodeladaptor.cpp b/src/controls/Private/qquicktreemodeladaptor.cpp index e5a0aa2d..9c0dd71c 100644 --- a/src/controls/Private/qquicktreemodeladaptor.cpp +++ b/src/controls/Private/qquicktreemodeladaptor.cpp @@ -51,17 +51,17 @@ QT_BEGIN_NAMESPACE # define ASSERT_CONSISTENCY qt_noop #endif -QQuickTreeModelAdaptor::QQuickTreeModelAdaptor(QObject *parent) : +QQuickTreeModelAdaptor1::QQuickTreeModelAdaptor1(QObject *parent) : QAbstractListModel(parent), m_model(0), m_lastItemIndex(0) { } -QAbstractItemModel *QQuickTreeModelAdaptor::model() const +QAbstractItemModel *QQuickTreeModelAdaptor1::model() const { return m_model; } -void QQuickTreeModelAdaptor::setModel(QAbstractItemModel *arg) +void QQuickTreeModelAdaptor1::setModel(QAbstractItemModel *arg) { struct Cx { const char *signal; @@ -115,7 +115,7 @@ void QQuickTreeModelAdaptor::setModel(QAbstractItemModel *arg) } } -void QQuickTreeModelAdaptor::clearModelData() +void QQuickTreeModelAdaptor1::clearModelData() { beginResetModel(); m_items.clear(); @@ -123,12 +123,12 @@ void QQuickTreeModelAdaptor::clearModelData() endResetModel(); } -const QModelIndex &QQuickTreeModelAdaptor::rootIndex() const +const QModelIndex &QQuickTreeModelAdaptor1::rootIndex() const { return m_rootIndex; } -void QQuickTreeModelAdaptor::setRootIndex(const QModelIndex &idx) +void QQuickTreeModelAdaptor1::setRootIndex(const QModelIndex &idx) { if (m_rootIndex == idx) return; @@ -141,12 +141,12 @@ void QQuickTreeModelAdaptor::setRootIndex(const QModelIndex &idx) emit rootIndexChanged(); } -void QQuickTreeModelAdaptor::resetRootIndex() +void QQuickTreeModelAdaptor1::resetRootIndex() { setRootIndex(QModelIndex()); } -QHash<int, QByteArray> QQuickTreeModelAdaptor::roleNames() const +QHash<int, QByteArray> QQuickTreeModelAdaptor1::roleNames() const { if (!m_model) return QHash<int, QByteArray>(); @@ -159,12 +159,12 @@ QHash<int, QByteArray> QQuickTreeModelAdaptor::roleNames() const return modelRoleNames; } -int QQuickTreeModelAdaptor::rowCount(const QModelIndex &) const +int QQuickTreeModelAdaptor1::rowCount(const QModelIndex &) const { return m_items.count(); } -QVariant QQuickTreeModelAdaptor::data(const QModelIndex &index, int role) const +QVariant QQuickTreeModelAdaptor1::data(const QModelIndex &index, int role) const { if (!m_model) return QVariant(); @@ -185,7 +185,7 @@ QVariant QQuickTreeModelAdaptor::data(const QModelIndex &index, int role) const } } -bool QQuickTreeModelAdaptor::setData(const QModelIndex &index, const QVariant &value, int role) +bool QQuickTreeModelAdaptor1::setData(const QModelIndex &index, const QVariant &value, int role) { if (!m_model) return false; @@ -203,7 +203,7 @@ bool QQuickTreeModelAdaptor::setData(const QModelIndex &index, const QVariant &v } } -int QQuickTreeModelAdaptor::itemIndex(const QModelIndex &index) const +int QQuickTreeModelAdaptor1::itemIndex(const QModelIndex &index) const { // This is basically a plagiarism of QTreeViewPrivate::viewIndex() if (!index.isValid() || index == m_rootIndex || m_items.isEmpty()) @@ -245,23 +245,23 @@ int QQuickTreeModelAdaptor::itemIndex(const QModelIndex &index) const return -1; } -bool QQuickTreeModelAdaptor::isVisible(const QModelIndex &index) +bool QQuickTreeModelAdaptor1::isVisible(const QModelIndex &index) { return itemIndex(index) != -1; } -bool QQuickTreeModelAdaptor::childrenVisible(const QModelIndex &index) +bool QQuickTreeModelAdaptor1::childrenVisible(const QModelIndex &index) { return (index == m_rootIndex && !m_items.isEmpty()) || (m_expandedItems.contains(index) && isVisible(index)); } -const QModelIndex &QQuickTreeModelAdaptor::mapToModel(const QModelIndex &index) const +const QModelIndex &QQuickTreeModelAdaptor1::mapToModel(const QModelIndex &index) const { return m_items.at(index.row()).index; } -QModelIndex QQuickTreeModelAdaptor::mapRowToModelIndex(int row) const +QModelIndex QQuickTreeModelAdaptor1::mapRowToModelIndex(int row) const { if (!m_model) return QModelIndex(); @@ -270,7 +270,7 @@ QModelIndex QQuickTreeModelAdaptor::mapRowToModelIndex(int row) const return m_items.at(row).index; } -QItemSelection QQuickTreeModelAdaptor::selectionForRowRange(const QModelIndex &fromIndex, const QModelIndex &toIndex) const +QItemSelection QQuickTreeModelAdaptor1::selectionForRowRange(const QModelIndex &fromIndex, const QModelIndex &toIndex) const { int from = itemIndex(fromIndex); int to = itemIndex(toIndex); @@ -323,7 +323,7 @@ QItemSelection QQuickTreeModelAdaptor::selectionForRowRange(const QModelIndex & return sel; } -void QQuickTreeModelAdaptor::showModelTopLevelItems(bool doInsertRows) +void QQuickTreeModelAdaptor1::showModelTopLevelItems(bool doInsertRows) { if (!m_model) return; @@ -337,7 +337,7 @@ void QQuickTreeModelAdaptor::showModelTopLevelItems(bool doInsertRows) showModelChildItems(TreeItem(m_rootIndex), 0, topLevelRowCount - 1, doInsertRows); } -void QQuickTreeModelAdaptor::showModelChildItems(const TreeItem &parentItem, int start, int end, bool doInsertRows, bool doExpandPendingRows) +void QQuickTreeModelAdaptor1::showModelChildItems(const TreeItem &parentItem, int start, int end, bool doInsertRows, bool doExpandPendingRows) { const QModelIndex &parentIndex = parentItem.index; int rowIdx = parentIndex.isValid() && parentIndex != m_rootIndex ? itemIndex(parentIndex) + 1 : 0; @@ -379,7 +379,7 @@ void QQuickTreeModelAdaptor::showModelChildItems(const TreeItem &parentItem, int } -void QQuickTreeModelAdaptor::expand(const QModelIndex &idx) +void QQuickTreeModelAdaptor1::expand(const QModelIndex &idx) { ASSERT_CONSISTENCY(); if (!m_model) @@ -400,7 +400,7 @@ void QQuickTreeModelAdaptor::expand(const QModelIndex &idx) emit expanded(idx); } -void QQuickTreeModelAdaptor::collapse(const QModelIndex &idx) +void QQuickTreeModelAdaptor1::collapse(const QModelIndex &idx) { ASSERT_CONSISTENCY(); if (!m_model) @@ -421,7 +421,7 @@ void QQuickTreeModelAdaptor::collapse(const QModelIndex &idx) emit collapsed(idx); } -bool QQuickTreeModelAdaptor::isExpanded(const QModelIndex &index) const +bool QQuickTreeModelAdaptor1::isExpanded(const QModelIndex &index) const { ASSERT_CONSISTENCY(); if (!m_model) @@ -430,12 +430,12 @@ bool QQuickTreeModelAdaptor::isExpanded(const QModelIndex &index) const return !index.isValid() || m_expandedItems.contains(index); } -bool QQuickTreeModelAdaptor::isExpanded(int row) const +bool QQuickTreeModelAdaptor1::isExpanded(int row) const { return m_items.at(row).expanded; } -void QQuickTreeModelAdaptor::expandRow(int n) +void QQuickTreeModelAdaptor1::expandRow(int n) { if (!m_model || isExpanded(n)) return; @@ -452,7 +452,7 @@ void QQuickTreeModelAdaptor::expandRow(int n) expandPendingRows(); } -void QQuickTreeModelAdaptor::expandPendingRows(bool doInsertRows) +void QQuickTreeModelAdaptor1::expandPendingRows(bool doInsertRows) { while (!m_itemsToExpand.isEmpty()) { TreeItem *item = m_itemsToExpand.takeFirst(); @@ -472,7 +472,7 @@ void QQuickTreeModelAdaptor::expandPendingRows(bool doInsertRows) } } -void QQuickTreeModelAdaptor::collapseRow(int n) +void QQuickTreeModelAdaptor1::collapseRow(int n) { if (!m_model || !isExpanded(n)) return; @@ -491,7 +491,7 @@ void QQuickTreeModelAdaptor::collapseRow(int n) removeVisibleRows(n + 1, lastIndex); } -int QQuickTreeModelAdaptor::lastChildIndex(const QModelIndex &index) +int QQuickTreeModelAdaptor1::lastChildIndex(const QModelIndex &index) { if (!m_expandedItems.contains(index)) return itemIndex(index); @@ -509,7 +509,7 @@ int QQuickTreeModelAdaptor::lastChildIndex(const QModelIndex &index) return firstIndex - 1; } -void QQuickTreeModelAdaptor::removeVisibleRows(int startIndex, int endIndex, bool doRemoveRows) +void QQuickTreeModelAdaptor1::removeVisibleRows(int startIndex, int endIndex, bool doRemoveRows) { if (startIndex < 0 || endIndex < 0 || startIndex > endIndex) return; @@ -521,14 +521,14 @@ void QQuickTreeModelAdaptor::removeVisibleRows(int startIndex, int endIndex, boo endRemoveRows(); } -void QQuickTreeModelAdaptor::modelHasBeenDestroyed() +void QQuickTreeModelAdaptor1::modelHasBeenDestroyed() { // The model has been deleted. This should behave as if no model was set clearModelData(); emit modelChanged(Q_NULLPTR); } -void QQuickTreeModelAdaptor::modelHasBeenReset() +void QQuickTreeModelAdaptor1::modelHasBeenReset() { clearModelData(); @@ -536,7 +536,7 @@ void QQuickTreeModelAdaptor::modelHasBeenReset() ASSERT_CONSISTENCY(); } -void QQuickTreeModelAdaptor::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRigth, const QVector<int> &roles) +void QQuickTreeModelAdaptor1::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRigth, const QVector<int> &roles) { Q_ASSERT(topLeft.parent() == bottomRigth.parent()); const QModelIndex &parent = topLeft.parent(); @@ -574,14 +574,14 @@ void QQuickTreeModelAdaptor::modelDataChanged(const QModelIndex &topLeft, const ASSERT_CONSISTENCY(); } -void QQuickTreeModelAdaptor::modelLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint) +void QQuickTreeModelAdaptor1::modelLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint) { ASSERT_CONSISTENCY(); Q_UNUSED(parents); Q_UNUSED(hint); } -void QQuickTreeModelAdaptor::modelLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint) +void QQuickTreeModelAdaptor1::modelLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint) { Q_UNUSED(hint); if (parents.isEmpty()) { @@ -608,7 +608,7 @@ void QQuickTreeModelAdaptor::modelLayoutChanged(const QList<QPersistentModelInde ASSERT_CONSISTENCY(); } -void QQuickTreeModelAdaptor::modelRowsAboutToBeInserted(const QModelIndex & parent, int start, int end) +void QQuickTreeModelAdaptor1::modelRowsAboutToBeInserted(const QModelIndex & parent, int start, int end) { Q_UNUSED(parent); Q_UNUSED(start); @@ -616,7 +616,7 @@ void QQuickTreeModelAdaptor::modelRowsAboutToBeInserted(const QModelIndex & pare ASSERT_CONSISTENCY(); } -void QQuickTreeModelAdaptor::modelRowsInserted(const QModelIndex & parent, int start, int end) +void QQuickTreeModelAdaptor1::modelRowsInserted(const QModelIndex & parent, int start, int end) { TreeItem item; int parentRow = itemIndex(parent); @@ -639,7 +639,7 @@ void QQuickTreeModelAdaptor::modelRowsInserted(const QModelIndex & parent, int s ASSERT_CONSISTENCY(); } -void QQuickTreeModelAdaptor::modelRowsAboutToBeRemoved(const QModelIndex & parent, int start, int end) +void QQuickTreeModelAdaptor1::modelRowsAboutToBeRemoved(const QModelIndex & parent, int start, int end) { ASSERT_CONSISTENCY(); if (parent == m_rootIndex || childrenVisible(parent)) { @@ -666,7 +666,7 @@ void QQuickTreeModelAdaptor::modelRowsAboutToBeRemoved(const QModelIndex & paren } } -void QQuickTreeModelAdaptor::modelRowsRemoved(const QModelIndex & parent, int start, int end) +void QQuickTreeModelAdaptor1::modelRowsRemoved(const QModelIndex & parent, int start, int end) { Q_UNUSED(start); Q_UNUSED(end); @@ -679,7 +679,7 @@ void QQuickTreeModelAdaptor::modelRowsRemoved(const QModelIndex & parent, int st ASSERT_CONSISTENCY(); } -void QQuickTreeModelAdaptor::modelRowsAboutToBeMoved(const QModelIndex & sourceParent, int sourceStart, int sourceEnd, const QModelIndex & destinationParent, int destinationRow) +void QQuickTreeModelAdaptor1::modelRowsAboutToBeMoved(const QModelIndex & sourceParent, int sourceStart, int sourceEnd, const QModelIndex & destinationParent, int destinationRow) { ASSERT_CONSISTENCY(); if (!childrenVisible(sourceParent)) @@ -743,14 +743,14 @@ void QQuickTreeModelAdaptor::modelRowsAboutToBeMoved(const QModelIndex & sourceP } } -void QQuickTreeModelAdaptor::modelRowsMoved(const QModelIndex & sourceParent, int sourceStart, int sourceEnd, const QModelIndex & destinationParent, int destinationRow) +void QQuickTreeModelAdaptor1::modelRowsMoved(const QModelIndex & sourceParent, int sourceStart, int sourceEnd, const QModelIndex & destinationParent, int destinationRow) { if (!childrenVisible(sourceParent) && childrenVisible(destinationParent)) modelRowsInserted(destinationParent, destinationRow, destinationRow + sourceEnd - sourceStart); ASSERT_CONSISTENCY(); } -void QQuickTreeModelAdaptor::dump() const +void QQuickTreeModelAdaptor1::dump() const { if (!m_model) return; @@ -770,7 +770,7 @@ void QQuickTreeModelAdaptor::dump() const } } -bool QQuickTreeModelAdaptor::testConsistency(bool dumpOnFail) const +bool QQuickTreeModelAdaptor1::testConsistency(bool dumpOnFail) const { if (!m_model) { if (!m_items.isEmpty()) { diff --git a/src/controls/Private/qquicktreemodeladaptor_p.h b/src/controls/Private/qquicktreemodeladaptor_p.h index 23d4bb37..ddad96cb 100644 --- a/src/controls/Private/qquicktreemodeladaptor_p.h +++ b/src/controls/Private/qquicktreemodeladaptor_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE class QAbstractItemModel; -class QQuickTreeModelAdaptor : public QAbstractListModel +class QQuickTreeModelAdaptor1 : public QAbstractListModel { Q_OBJECT Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged) @@ -69,7 +69,7 @@ class QQuickTreeModelAdaptor : public QAbstractListModel struct TreeItem; public: - explicit QQuickTreeModelAdaptor(QObject *parent = 0); + explicit QQuickTreeModelAdaptor1(QObject *parent = 0); QAbstractItemModel *model() const; const QModelIndex &rootIndex() const; diff --git a/src/controls/Private/qquickwheelarea.cpp b/src/controls/Private/qquickwheelarea.cpp index c49460b5..9c0a70a2 100644 --- a/src/controls/Private/qquickwheelarea.cpp +++ b/src/controls/Private/qquickwheelarea.cpp @@ -54,7 +54,7 @@ static const qreal pixelDeltaAdjustment = 0.5; // comes originally from QTextEdit, which sets 20px steps by default. static const qreal defaultScrollSpeed = 20.0; -QQuickWheelArea::QQuickWheelArea(QQuickItem *parent) +QQuickWheelArea1::QQuickWheelArea1(QQuickItem *parent) : QQuickItem(parent), m_horizontalMinimumValue(0), m_horizontalMaximumValue(0), @@ -70,33 +70,38 @@ QQuickWheelArea::QQuickWheelArea(QQuickItem *parent) } -QQuickWheelArea::~QQuickWheelArea() +QQuickWheelArea1::~QQuickWheelArea1() { } -bool QQuickWheelArea::isAtXEnd() const +bool QQuickWheelArea1::isAtXEnd() const { return qFuzzyCompare(m_horizontalMaximumValue, m_horizontalValue); } -bool QQuickWheelArea::isAtXBeginning() const +bool QQuickWheelArea1::isAtXBeginning() const { return qFuzzyCompare(m_horizontalMinimumValue, m_horizontalValue); } -bool QQuickWheelArea::isAtYEnd() const +bool QQuickWheelArea1::isAtYEnd() const { return qFuzzyCompare(m_verticalMaximumValue, m_verticalValue); } -bool QQuickWheelArea::isAtYBeginning() const +bool QQuickWheelArea1::isAtYBeginning() const { return qFuzzyCompare(m_verticalMinimumValue, m_verticalValue); } +bool QQuickWheelArea1::isInverted() const +{ + return m_inverted; +} + #ifndef QT_NO_WHEELEVENT -void QQuickWheelArea::wheelEvent(QWheelEvent *we) +void QQuickWheelArea1::wheelEvent(QWheelEvent *we) { if (we->phase() == Qt::ScrollBegin) setActive(true); @@ -106,6 +111,8 @@ void QQuickWheelArea::wheelEvent(QWheelEvent *we) QPoint numPixels = we->pixelDelta(); QPoint numDegrees = we->angleDelta() / 8; + m_inverted = we->inverted(); + if (!numPixels.isNull()) { setHorizontalDelta(numPixels.x() * pixelDeltaAdjustment); setVerticalDelta(numPixels.y() * pixelDeltaAdjustment); @@ -132,47 +139,47 @@ void QQuickWheelArea::wheelEvent(QWheelEvent *we) } #endif -void QQuickWheelArea::setHorizontalMinimumValue(qreal value) +void QQuickWheelArea1::setHorizontalMinimumValue(qreal value) { m_horizontalMinimumValue = value; } -qreal QQuickWheelArea::horizontalMinimumValue() const +qreal QQuickWheelArea1::horizontalMinimumValue() const { return m_horizontalMinimumValue; } -void QQuickWheelArea::setHorizontalMaximumValue(qreal value) +void QQuickWheelArea1::setHorizontalMaximumValue(qreal value) { m_horizontalMaximumValue = value; } -qreal QQuickWheelArea::horizontalMaximumValue() const +qreal QQuickWheelArea1::horizontalMaximumValue() const { return m_horizontalMaximumValue; } -void QQuickWheelArea::setVerticalMinimumValue(qreal value) +void QQuickWheelArea1::setVerticalMinimumValue(qreal value) { m_verticalMinimumValue = value; } -qreal QQuickWheelArea::verticalMinimumValue() const +qreal QQuickWheelArea1::verticalMinimumValue() const { return m_verticalMinimumValue; } -void QQuickWheelArea::setVerticalMaximumValue(qreal value) +void QQuickWheelArea1::setVerticalMaximumValue(qreal value) { m_verticalMaximumValue = value; } -qreal QQuickWheelArea::verticalMaximumValue() const +qreal QQuickWheelArea1::verticalMaximumValue() const { return m_verticalMaximumValue; } -void QQuickWheelArea::setHorizontalValue(qreal value) +void QQuickWheelArea1::setHorizontalValue(qreal value) { value = qBound<qreal>(m_horizontalMinimumValue, value, m_horizontalMaximumValue); @@ -182,12 +189,12 @@ void QQuickWheelArea::setHorizontalValue(qreal value) } } -qreal QQuickWheelArea::horizontalValue() const +qreal QQuickWheelArea1::horizontalValue() const { return m_horizontalValue; } -void QQuickWheelArea::setVerticalValue(qreal value) +void QQuickWheelArea1::setVerticalValue(qreal value) { value = qBound<qreal>(m_verticalMinimumValue, value, m_verticalMaximumValue); @@ -197,12 +204,12 @@ void QQuickWheelArea::setVerticalValue(qreal value) } } -qreal QQuickWheelArea::verticalValue() const +qreal QQuickWheelArea1::verticalValue() const { return m_verticalValue; } -void QQuickWheelArea::setVerticalDelta(qreal value) +void QQuickWheelArea1::setVerticalDelta(qreal value) { m_verticalDelta = value; setVerticalValue(m_verticalValue - m_verticalDelta); @@ -210,12 +217,12 @@ void QQuickWheelArea::setVerticalDelta(qreal value) emit verticalWheelMoved(); } -qreal QQuickWheelArea::verticalDelta() const +qreal QQuickWheelArea1::verticalDelta() const { return m_verticalDelta; } -void QQuickWheelArea::setHorizontalDelta(qreal value) +void QQuickWheelArea1::setHorizontalDelta(qreal value) { m_horizontalDelta = value; setHorizontalValue(m_horizontalValue - m_horizontalDelta); @@ -223,12 +230,12 @@ void QQuickWheelArea::setHorizontalDelta(qreal value) emit horizontalWheelMoved(); } -qreal QQuickWheelArea::horizontalDelta() const +qreal QQuickWheelArea1::horizontalDelta() const { return m_horizontalDelta; } -void QQuickWheelArea::setScrollSpeed(qreal value) +void QQuickWheelArea1::setScrollSpeed(qreal value) { if (value != m_scrollSpeed) { m_scrollSpeed = value; @@ -236,17 +243,17 @@ void QQuickWheelArea::setScrollSpeed(qreal value) } } -qreal QQuickWheelArea::scrollSpeed() const +qreal QQuickWheelArea1::scrollSpeed() const { return m_scrollSpeed; } -bool QQuickWheelArea::isActive() const +bool QQuickWheelArea1::isActive() const { return m_active; } -void QQuickWheelArea::setActive(bool active) +void QQuickWheelArea1::setActive(bool active) { if (active != m_active) { m_active = active; diff --git a/src/controls/Private/qquickwheelarea_p.h b/src/controls/Private/qquickwheelarea_p.h index b66b147c..676383bc 100644 --- a/src/controls/Private/qquickwheelarea_p.h +++ b/src/controls/Private/qquickwheelarea_p.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -class QQuickWheelArea : public QQuickItem +class QQuickWheelArea1 : public QQuickItem { Q_OBJECT Q_PROPERTY(qreal verticalDelta READ verticalDelta WRITE setVerticalDelta NOTIFY verticalWheelMoved) @@ -58,10 +58,11 @@ class QQuickWheelArea : public QQuickItem Q_PROPERTY(qreal verticalValue READ verticalValue WRITE setVerticalValue) Q_PROPERTY(qreal scrollSpeed READ scrollSpeed WRITE setScrollSpeed NOTIFY scrollSpeedChanged) Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) + Q_PROPERTY(bool inverted READ isInverted) public: - QQuickWheelArea(QQuickItem *parent = 0); - virtual ~QQuickWheelArea(); + QQuickWheelArea1(QQuickItem *parent = 0); + virtual ~QQuickWheelArea1(); void setHorizontalMinimumValue(qreal value); qreal horizontalMinimumValue() const; @@ -92,6 +93,7 @@ public: bool isActive() const; void setActive(bool active); + bool isInverted() const; #ifndef QT_NO_WHEELEVENT void wheelEvent(QWheelEvent *event); @@ -121,12 +123,13 @@ private: qreal m_horizontalDelta; qreal m_scrollSpeed; bool m_active; + bool m_inverted; - Q_DISABLE_COPY(QQuickWheelArea) + Q_DISABLE_COPY(QQuickWheelArea1) }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickWheelArea) +QML_DECLARE_TYPE(QQuickWheelArea1) #endif // QQUICKWHEELAREA_P_H diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index 1a34c049..f38db0e4 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -317,14 +317,14 @@ Control { onVerticalWheelMoved: { if (verticalDelta !== 0) { var delta = Math.abs(verticalDelta)*step > stepSize ? verticalDelta*step : verticalDelta/Math.abs(verticalDelta)*stepSize - value += delta + value -= delta * (inverted ? 1 : -1) } } onHorizontalWheelMoved: { if (horizontalDelta !== 0) { var delta = Math.abs(horizontalDelta)*step > stepSize ? horizontalDelta*step : horizontalDelta/Math.abs(horizontalDelta)*stepSize - value += delta + value += delta * (inverted ? 1 : -1) } } } diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index ea997209..999649b0 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -180,9 +180,7 @@ Control { \since QtQuick.Controls 1.1 This signal is emitted when the Return or Enter key is pressed or - the control loses focus. Note that if there is a validator - set on the control and enter/return is pressed, this signal will - only be emitted if the validator returns an acceptable state. + the control loses focus. The corresponding handler is \c onEditingFinished. */ diff --git a/src/controls/Styles/Android/plugin.cpp b/src/controls/Styles/Android/plugin.cpp index 3c6f37e8..5656b83d 100644 --- a/src/controls/Styles/Android/plugin.cpp +++ b/src/controls/Styles/Android/plugin.cpp @@ -44,21 +44,29 @@ #include "qquickandroidstyle_p.h" #include "qquickandroid9patch_p.h" +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_Controls_Styles_Android); +#endif +} + QT_BEGIN_NAMESPACE -class QtQuickControlsAndroidStylePlugin: public QQmlExtensionPlugin +class QtQuickControls1AndroidStylePlugin: public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QtQuickControls1AndroidStylePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri); }; -void QtQuickControlsAndroidStylePlugin::registerTypes(const char *uri) +void QtQuickControls1AndroidStylePlugin::registerTypes(const char *uri) { - qmlRegisterType<QQuickAndroid9Patch>(uri, 1, 0, "Android9Patch"); - qmlRegisterType<QQuickAndroidStyle>(uri, 1, 0, "AndroidStyleBase"); + qmlRegisterType<QQuickAndroid9Patch1>(uri, 1, 0, "Android9Patch"); + qmlRegisterType<QQuickAndroidStyle1>(uri, 1, 0, "AndroidStyleBase"); } QT_END_NAMESPACE diff --git a/src/controls/Styles/Android/qquickandroid9patch.cpp b/src/controls/Styles/Android/qquickandroid9patch.cpp index 156197e2..48e86baa 100644 --- a/src/controls/Styles/Android/qquickandroid9patch.cpp +++ b/src/controls/Styles/Android/qquickandroid9patch.cpp @@ -43,21 +43,21 @@ QT_BEGIN_NAMESPACE -class QQuickAndroid9PatchNode : public QSGGeometryNode +class QQuickAndroid9PatchNode1 : public QSGGeometryNode { public: - QQuickAndroid9PatchNode(); - ~QQuickAndroid9PatchNode(); + QQuickAndroid9PatchNode1(); + ~QQuickAndroid9PatchNode1(); void initialize(QSGTexture *texture, const QRectF &bounds, const QSize &sourceSize, - const QQuickAndroid9PatchDivs &xDivs, const QQuickAndroid9PatchDivs &yDivs); + const QQuickAndroid9PatchDivs1 &xDivs, const QQuickAndroid9PatchDivs1 &yDivs); private: QSGGeometry m_geometry; QSGTextureMaterial m_material; }; -QQuickAndroid9PatchNode::QQuickAndroid9PatchNode() +QQuickAndroid9PatchNode1::QQuickAndroid9PatchNode1() : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4) { m_geometry.setDrawingMode(GL_TRIANGLES); @@ -65,13 +65,13 @@ QQuickAndroid9PatchNode::QQuickAndroid9PatchNode() setMaterial(&m_material); } -QQuickAndroid9PatchNode::~QQuickAndroid9PatchNode() +QQuickAndroid9PatchNode1::~QQuickAndroid9PatchNode1() { delete m_material.texture(); } -void QQuickAndroid9PatchNode::initialize(QSGTexture *texture, const QRectF &bounds, const QSize &sourceSize, - const QQuickAndroid9PatchDivs &xDivs, const QQuickAndroid9PatchDivs &yDivs) +void QQuickAndroid9PatchNode1::initialize(QSGTexture *texture, const QRectF &bounds, const QSize &sourceSize, + const QQuickAndroid9PatchDivs1 &xDivs, const QQuickAndroid9PatchDivs1 &yDivs) { delete m_material.texture(); m_material.setTexture(texture); @@ -115,7 +115,7 @@ void QQuickAndroid9PatchNode::initialize(QSGTexture *texture, const QRectF &boun markDirty(QSGNode::DirtyGeometry | QSGNode::DirtyMaterial); } -QVector<qreal> QQuickAndroid9PatchDivs::coordsForSize(qreal size) const +QVector<qreal> QQuickAndroid9PatchDivs1::coordsForSize(qreal size) const { // n = number of stretchable sections // We have to compensate when adding 0 and/or @@ -141,7 +141,7 @@ QVector<qreal> QQuickAndroid9PatchDivs::coordsForSize(qreal size) const return coords; } -void QQuickAndroid9PatchDivs::fill(const QVariantList &divs, qreal size) +void QQuickAndroid9PatchDivs1::fill(const QVariantList &divs, qreal size) { if (!data.isEmpty()) return; @@ -161,27 +161,27 @@ void QQuickAndroid9PatchDivs::fill(const QVariantList &divs, qreal size) data.append(size); } -void QQuickAndroid9PatchDivs::clear() +void QQuickAndroid9PatchDivs1::clear() { data.clear(); } -QQuickAndroid9Patch::QQuickAndroid9Patch(QQuickItem *parent) : QQuickItem(parent) +QQuickAndroid9Patch1::QQuickAndroid9Patch1(QQuickItem *parent) : QQuickItem(parent) { connect(this, SIGNAL(widthChanged()), this, SLOT(updateDivs())); connect(this, SIGNAL(heightChanged()), this, SLOT(updateDivs())); } -QQuickAndroid9Patch::~QQuickAndroid9Patch() +QQuickAndroid9Patch1::~QQuickAndroid9Patch1() { } -QUrl QQuickAndroid9Patch::source() const +QUrl QQuickAndroid9Patch1::source() const { return m_source; } -void QQuickAndroid9Patch::setSource(const QUrl &source) +void QQuickAndroid9Patch1::setSource(const QUrl &source) { if (m_source != source) { m_source = source; @@ -195,12 +195,12 @@ void QQuickAndroid9Patch::setSource(const QUrl &source) } } -QVariantList QQuickAndroid9Patch::xDivs() const +QVariantList QQuickAndroid9Patch1::xDivs() const { return m_xVars; } -void QQuickAndroid9Patch::setXDivs(const QVariantList &divs) +void QQuickAndroid9Patch1::setXDivs(const QVariantList &divs) { if (m_xVars != divs) { m_xVars = divs; @@ -211,12 +211,12 @@ void QQuickAndroid9Patch::setXDivs(const QVariantList &divs) } } -QVariantList QQuickAndroid9Patch::yDivs() const +QVariantList QQuickAndroid9Patch1::yDivs() const { return m_yVars; } -void QQuickAndroid9Patch::setYDivs(const QVariantList &divs) +void QQuickAndroid9Patch1::setYDivs(const QVariantList &divs) { if (m_yVars != divs) { m_yVars = divs; @@ -227,23 +227,23 @@ void QQuickAndroid9Patch::setYDivs(const QVariantList &divs) } } -QSize QQuickAndroid9Patch::sourceSize() const +QSize QQuickAndroid9Patch1::sourceSize() const { return m_sourceSize; } -void QQuickAndroid9Patch::classBegin() +void QQuickAndroid9Patch1::classBegin() { QQuickItem::classBegin(); } -void QQuickAndroid9Patch::componentComplete() +void QQuickAndroid9Patch1::componentComplete() { QQuickItem::componentComplete(); loadImage(); } -QSGNode *QQuickAndroid9Patch::updatePaintNode(QSGNode *node, UpdatePaintNodeData *data) +QSGNode *QQuickAndroid9Patch1::updatePaintNode(QSGNode *node, UpdatePaintNodeData *data) { Q_UNUSED(data); @@ -252,9 +252,9 @@ QSGNode *QQuickAndroid9Patch::updatePaintNode(QSGNode *node, UpdatePaintNodeData return 0; } - QQuickAndroid9PatchNode *patchNode = static_cast<QQuickAndroid9PatchNode *>(node); + QQuickAndroid9PatchNode1 *patchNode = static_cast<QQuickAndroid9PatchNode1 *>(node); if (!patchNode) - patchNode = new QQuickAndroid9PatchNode; + patchNode = new QQuickAndroid9PatchNode1; #ifdef QSG_RUNTIME_DESCRIPTION qsgnode_set_description(patchNode, QString::fromLatin1("Android9Patch: '%1'").arg(m_source.toString())); @@ -265,7 +265,7 @@ QSGNode *QQuickAndroid9Patch::updatePaintNode(QSGNode *node, UpdatePaintNodeData return patchNode; } -void QQuickAndroid9Patch::loadImage() +void QQuickAndroid9Patch1::loadImage() { if (!isComponentComplete()) return; @@ -281,7 +281,7 @@ void QQuickAndroid9Patch::loadImage() updateDivs(); } -void QQuickAndroid9Patch::updateDivs() +void QQuickAndroid9Patch1::updateDivs() { if (!isComponentComplete() || m_image.isNull() || width() <= 0 || height() <= 0) return; diff --git a/src/controls/Styles/Android/qquickandroid9patch_p.h b/src/controls/Styles/Android/qquickandroid9patch_p.h index 31f59408..8d0c2a7b 100644 --- a/src/controls/Styles/Android/qquickandroid9patch_p.h +++ b/src/controls/Styles/Android/qquickandroid9patch_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -struct QQuickAndroid9PatchDivs +struct QQuickAndroid9PatchDivs1 { QVector<qreal> coordsForSize(qreal size) const; @@ -57,7 +57,7 @@ struct QQuickAndroid9PatchDivs QVector<qreal> data; }; -class QQuickAndroid9Patch : public QQuickItem +class QQuickAndroid9Patch1 : public QQuickItem { Q_OBJECT @@ -67,8 +67,8 @@ class QQuickAndroid9Patch : public QQuickItem Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged FINAL) public: - explicit QQuickAndroid9Patch(QQuickItem *parent = 0); - ~QQuickAndroid9Patch(); + explicit QQuickAndroid9Patch1(QQuickItem *parent = 0); + ~QQuickAndroid9Patch1(); QUrl source() const; QVariantList xDivs() const; @@ -101,8 +101,8 @@ private: QSize m_sourceSize; QVariantList m_xVars; QVariantList m_yVars; - QQuickAndroid9PatchDivs m_xDivs; - QQuickAndroid9PatchDivs m_yDivs; + QQuickAndroid9PatchDivs1 m_xDivs; + QQuickAndroid9PatchDivs1 m_yDivs; }; QT_END_NAMESPACE diff --git a/src/controls/Styles/Android/qquickandroidstyle.cpp b/src/controls/Styles/Android/qquickandroidstyle.cpp index 41f3113c..0c57d795 100644 --- a/src/controls/Styles/Android/qquickandroidstyle.cpp +++ b/src/controls/Styles/Android/qquickandroidstyle.cpp @@ -73,26 +73,26 @@ static QString resolvePath() return stylePath; } -QQuickAndroidStyle::QQuickAndroidStyle(QObject *parent) : QObject(parent) +QQuickAndroidStyle1::QQuickAndroidStyle1(QObject *parent) : QObject(parent) { m_path = resolvePath(); } -QByteArray QQuickAndroidStyle::data() const +QByteArray QQuickAndroidStyle1::data() const { if (m_data.isNull() && !m_path.isNull()) m_data = readFile(m_path + QLatin1String("style.json")); return m_data; } -QString QQuickAndroidStyle::filePath(const QString &fileName) const +QString QQuickAndroidStyle1::filePath(const QString &fileName) const { if (!fileName.isEmpty()) return m_path + QFileInfo(fileName).fileName(); return QString(); } -QColor QQuickAndroidStyle::colorValue(uint value) const +QColor QQuickAndroidStyle1::colorValue(uint value) const { return QColor::fromRgba(value); } diff --git a/src/controls/Styles/Android/qquickandroidstyle_p.h b/src/controls/Styles/Android/qquickandroidstyle_p.h index bda37d6a..6911eb8d 100644 --- a/src/controls/Styles/Android/qquickandroidstyle_p.h +++ b/src/controls/Styles/Android/qquickandroidstyle_p.h @@ -45,14 +45,14 @@ QT_BEGIN_NAMESPACE -class QQuickAndroidStyle : public QObject +class QQuickAndroidStyle1 : public QObject { Q_OBJECT Q_PROPERTY(QByteArray data READ data CONSTANT FINAL) Q_ENUMS(Gravity) public: - QQuickAndroidStyle(QObject *parent = 0); + QQuickAndroidStyle1(QObject *parent = 0); QByteArray data() const; diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml index 8e4102c7..085fa56e 100644 --- a/src/controls/Styles/Base/SliderStyle.qml +++ b/src/controls/Styles/Base/SliderStyle.qml @@ -162,9 +162,12 @@ Style { } } - /*! This property holds the tick mark labels + /*! This property holds the tick mark labels. \since QtQuick.Controls.Styles 1.1 + Every tickmark that should be drawn must be defined within this + component, so it is common to use a \l Repeater, for example. + You can access the handle width through the \c styleData.handleWidth property. */ property Component tickmarks: Repeater { diff --git a/src/controls/Styles/iOS/iOS.pri b/src/controls/Styles/iOS/iOS.pri new file mode 100644 index 00000000..ac878066 --- /dev/null +++ b/src/controls/Styles/iOS/iOS.pri @@ -0,0 +1,27 @@ +QML_FILES += \ + $$PWD/ApplicationWindowStyle.qml \ + $$PWD/BusyIndicatorStyle.qml \ + $$PWD/ButtonStyle.qml \ + $$PWD/CalendarStyle.qml \ + $$PWD/CheckBoxStyle.qml \ + $$PWD/ComboBoxStyle.qml \ + $$PWD/FocusFrameStyle.qml \ + $$PWD/GroupBoxStyle.qml \ + $$PWD/MenuBarStyle.qml \ + $$PWD/MenuStyle.qml \ + $$PWD/ProgressBarStyle.qml \ + $$PWD/RadioButtonStyle.qml \ + $$PWD/ScrollViewStyle.qml\ + $$PWD/SliderStyle.qml \ + $$PWD/SpinBoxStyle.qml \ + $$PWD/StatusBarStyle.qml \ + $$PWD/SwitchStyle.qml \ + $$PWD/TableViewStyle.qml \ + $$PWD/TabViewStyle.qml \ + $$PWD/TextAreaStyle.qml \ + $$PWD/TextFieldStyle.qml \ + $$PWD/ToolBarStyle.qml \ + $$PWD/ToolButtonStyle.qml \ + $$PWD/CursorHandleStyle.qml \ + $$PWD/SelectionHandleStyle.qml \ + $$PWD/CursorDelegate.qml diff --git a/src/controls/Styles/iOS/iOS.pro b/src/controls/Styles/iOS/iOS.pro index 886c1dc1..3fe6ff03 100644 --- a/src/controls/Styles/iOS/iOS.pro +++ b/src/controls/Styles/iOS/iOS.pro @@ -1,32 +1,6 @@ TARGETPATH = QtQuick/Controls/Styles/iOS IMPORT_VERSION = 1.0 -QML_FILES += \ - $$PWD/ApplicationWindowStyle.qml \ - $$PWD/BusyIndicatorStyle.qml \ - $$PWD/ButtonStyle.qml \ - $$PWD/CalendarStyle.qml \ - $$PWD/CheckBoxStyle.qml \ - $$PWD/ComboBoxStyle.qml \ - $$PWD/FocusFrameStyle.qml \ - $$PWD/GroupBoxStyle.qml \ - $$PWD/MenuBarStyle.qml \ - $$PWD/MenuStyle.qml \ - $$PWD/ProgressBarStyle.qml \ - $$PWD/RadioButtonStyle.qml \ - $$PWD/ScrollViewStyle.qml\ - $$PWD/SliderStyle.qml \ - $$PWD/SpinBoxStyle.qml \ - $$PWD/StatusBarStyle.qml \ - $$PWD/SwitchStyle.qml \ - $$PWD/TableViewStyle.qml \ - $$PWD/TabViewStyle.qml \ - $$PWD/TextAreaStyle.qml \ - $$PWD/TextFieldStyle.qml \ - $$PWD/ToolBarStyle.qml \ - $$PWD/ToolButtonStyle.qml \ - $$PWD/CursorHandleStyle.qml \ - $$PWD/SelectionHandleStyle.qml \ - $$PWD/CursorDelegate.qml +include(ios.pri) load(qml_module) diff --git a/src/controls/Styles/styles.pri b/src/controls/Styles/styles.pri index 74dbd67b..5b2b61c2 100644 --- a/src/controls/Styles/styles.pri +++ b/src/controls/Styles/styles.pri @@ -109,5 +109,5 @@ STYLES_QML_FILES += \ $$PWD/Base/images/needle.png STYLES_QML_FILES += $$PWD/qmldir - -!qtquickcompiler: QML_FILES += $$STYLES_QML_FILES +ios:static: include(iOS/ios.pri) +!qtquickcompiler|static: QML_FILES += $$STYLES_QML_FILES diff --git a/src/controls/TreeView.qml b/src/controls/TreeView.qml index 49b88486..aa21acc1 100644 --- a/src/controls/TreeView.qml +++ b/src/controls/TreeView.qml @@ -213,6 +213,8 @@ BasicTableView { if (selectionMode === SelectionMode.SingleSelection) return selection.currentIndex === modelIndex return selection.hasSelection && selection.isSelected(modelIndex) + } else { + return false } } diff --git a/src/controls/controls.pro b/src/controls/controls.pro index f725b1ce..794a6e36 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -54,32 +54,37 @@ include(Styles/styles.pri) osx: LIBS_PRIVATE += -framework Carbon -# Create the resource file -GENERATED_RESOURCE_FILE = $$OUT_PWD/controls.qrc - -INCLUDED_RESOURCE_FILES = \ - $$CONTROLS_QML_FILES \ - $$PRIVATE_QML_FILES \ - $$STYLES_QML_FILES - -RESOURCE_CONTENT = \ - "<RCC>" \ - "<qresource prefix=\"/QtQuick/Controls\">" - -for(resourcefile, INCLUDED_RESOURCE_FILES) { - resourcefileabsolutepath = $$absolute_path($$resourcefile) - relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) - relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) - RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>" +!static { + # Create the resource file + GENERATED_RESOURCE_FILE = $$OUT_PWD/controls.qrc + + INCLUDED_RESOURCE_FILES = \ + $$CONTROLS_QML_FILES \ + $$PRIVATE_QML_FILES \ + $$STYLES_QML_FILES + + RESOURCE_CONTENT = \ + "<RCC>" \ + "<qresource prefix=\"/QtQuick/Controls\">" + + for(resourcefile, INCLUDED_RESOURCE_FILES) { + resourcefileabsolutepath = $$absolute_path($$resourcefile) + relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) + relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) + RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>" + } + + RESOURCE_CONTENT += \ + "</qresource>" \ + "</RCC>" + + write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") + + RESOURCES += $$GENERATED_RESOURCE_FILE +} else { + QML_FILES *= $$CONTROLS_QML_FILES \ + $$PRIVATE_QML_FILES \ + $$STYLES_QML_FILES } - -RESOURCE_CONTENT += \ - "</qresource>" \ - "</RCC>" - -write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") - -RESOURCES += $$GENERATED_RESOURCE_FILE - CONFIG += no_cxx_module load(qml_plugin) diff --git a/src/controls/doc/images/applicationwindow.png b/src/controls/doc/images/applicationwindow.png Binary files differindex 90111f72..478cdda5 100644 --- a/src/controls/doc/images/applicationwindow.png +++ b/src/controls/doc/images/applicationwindow.png diff --git a/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png b/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png Binary files differindex b8e1faab..0c54d62b 100644 --- a/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png +++ b/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png diff --git a/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png b/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png Binary files differindex 94619bae..cfea7771 100644 --- a/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png +++ b/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png diff --git a/src/controls/doc/images/qtquickcontrols-example-text.png b/src/controls/doc/images/qtquickcontrols-example-text.png Binary files differindex 36aab4d5..94813412 100644 --- a/src/controls/doc/images/qtquickcontrols-example-text.png +++ b/src/controls/doc/images/qtquickcontrols-example-text.png diff --git a/src/controls/doc/images/qtquickcontrols-example-touch.png b/src/controls/doc/images/qtquickcontrols-example-touch.png Binary files differindex e33455bc..d4f26589 100644 --- a/src/controls/doc/images/qtquickcontrols-example-touch.png +++ b/src/controls/doc/images/qtquickcontrols-example-touch.png diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index bb37692c..528f05a8 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -73,7 +73,11 @@ static void initResources() { +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_Controls); +#else Q_INIT_RESOURCE(controls); +#endif } QT_BEGIN_NAMESPACE @@ -121,61 +125,65 @@ static const struct { { "TreeView", 1, 5 } }; -void QtQuickControlsPlugin::registerTypes(const char *uri) +QtQuickControls1Plugin::QtQuickControls1Plugin(QObject *parent) : QQmlExtensionPlugin(parent) { initResources(); - qmlRegisterType<QQuickAction>(uri, 1, 0, "Action"); +} + +void QtQuickControls1Plugin::registerTypes(const char *uri) +{ + qmlRegisterType<QQuickAction1>(uri, 1, 0, "Action"); qmlRegisterType<QQuickExclusiveGroup1>(uri, 1, 0, "ExclusiveGroup"); qmlRegisterType<QQuickMenuItem1>(uri, 1, 0, "MenuItem"); - qmlRegisterUncreatableType<QQuickMenuItemType>(uri, 1, 0, "MenuItemType", + qmlRegisterUncreatableType<QQuickMenuItemType1>(uri, 1, 0, "MenuItemType", QLatin1String("Do not create objects of type MenuItemType")); - qmlRegisterType<QQuickMenuSeparator>(uri, 1, 0, "MenuSeparator"); - qmlRegisterUncreatableType<QQuickMenuBase>(uri, 1, 0, "MenuBase", + qmlRegisterType<QQuickMenuSeparator1>(uri, 1, 0, "MenuSeparator"); + qmlRegisterUncreatableType<QQuickMenuBase1>(uri, 1, 0, "MenuBase", QLatin1String("Do not create objects of type MenuBase")); - qmlRegisterUncreatableType<QQuickStack>(uri, 1, 0, "Stack", QLatin1String("Do not create objects of type Stack")); - qmlRegisterUncreatableType<QQuickSelectionMode>(uri, 1, 1, "SelectionMode", QLatin1String("Do not create objects of type SelectionMode")); + qmlRegisterUncreatableType<QQuickStack1>(uri, 1, 0, "Stack", QLatin1String("Do not create objects of type Stack")); + qmlRegisterUncreatableType<QQuickSelectionMode1>(uri, 1, 1, "SelectionMode", QLatin1String("Do not create objects of type SelectionMode")); const QString filesLocation = fileLocation(); for (int i = 0; i < int(sizeof(qmldir)/sizeof(qmldir[0])); i++) qmlRegisterType(QUrl(filesLocation + "/" + qmldir[i].type + ".qml"), uri, qmldir[i].major, qmldir[i].minor, qmldir[i].type); } -void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri) +void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *uri) { Q_UNUSED(uri); // Register private API. Note that to use these types outside of the // Qt Quick Controls module, both the public and private imports must be used. const char *private_uri = "QtQuick.Controls.Private"; - qmlRegisterType<QQuickAbstractStyle>(private_uri, 1, 0, "AbstractStyle"); - qmlRegisterType<QQuickCalendarModel>(private_uri, 1, 0, "CalendarModel"); - qmlRegisterType<QQuickPadding>(private_uri, 1, 0, "Padding"); - qmlRegisterType<QQuickRangedDate>(private_uri, 1, 0, "RangedDate"); - qmlRegisterType<QQuickRangeModel>(private_uri, 1, 0, "RangeModel"); - qmlRegisterType<QQuickWheelArea>(private_uri, 1, 0, "WheelArea"); - qmlRegisterType<QQuickSpinBoxValidator>(private_uri, 1, 0, "SpinBoxValidator"); - qmlRegisterSingletonType<QQuickTooltip>(private_uri, 1, 0, "Tooltip", QQuickControlsPrivate::registerTooltipModule); - qmlRegisterSingletonType<QQuickControlSettings>(private_uri, 1, 0, "Settings", QQuickControlsPrivate::registerSettingsModule); - - qmlRegisterUncreatableType<QQuickControlsPrivate>(private_uri, 1, 0, "Controls", QLatin1String("Controls is an abstract type.")); - qmlRegisterType<QQuickControlsPrivateAttached>(); - - qmlRegisterType<QQuickTreeModelAdaptor>(private_uri, 1, 0, "TreeModelAdaptor"); - qmlRegisterType<QQuickScenePosListener>(private_uri, 1, 0, "ScenePosListener"); + qmlRegisterType<QQuickAbstractStyle1>(private_uri, 1, 0, "AbstractStyle"); + qmlRegisterType<QQuickCalendarModel1>(private_uri, 1, 0, "CalendarModel"); + qmlRegisterType<QQuickPadding1>(private_uri, 1, 0, "Padding"); + qmlRegisterType<QQuickRangedDate1>(private_uri, 1, 0, "RangedDate"); + qmlRegisterType<QQuickRangeModel1>(private_uri, 1, 0, "RangeModel"); + qmlRegisterType<QQuickWheelArea1>(private_uri, 1, 0, "WheelArea"); + qmlRegisterType<QQuickSpinBoxValidator1>(private_uri, 1, 0, "SpinBoxValidator"); + qmlRegisterSingletonType<QQuickTooltip1>(private_uri, 1, 0, "Tooltip", QQuickControlsPrivate1::registerTooltipModule); + qmlRegisterSingletonType<QQuickControlSettings1>(private_uri, 1, 0, "Settings", QQuickControlsPrivate1::registerSettingsModule); + + qmlRegisterUncreatableType<QQuickControlsPrivate1>(private_uri, 1, 0, "Controls", QLatin1String("Controls is an abstract type.")); + qmlRegisterType<QQuickControlsPrivate1Attached>(); + + qmlRegisterType<QQuickTreeModelAdaptor1>(private_uri, 1, 0, "TreeModelAdaptor"); + qmlRegisterType<QQuickScenePosListener1>(private_uri, 1, 0, "ScenePosListener"); qmlRegisterType<QQuickMenu1>(private_uri, 1, 0, "MenuPrivate"); qmlRegisterType<QQuickMenuBar1>(private_uri, 1, 0, "MenuBarPrivate"); - qmlRegisterType<QQuickPopupWindow>(private_uri, 1, 0, "PopupWindow"); + qmlRegisterType<QQuickPopupWindow1>(private_uri, 1, 0, "PopupWindow"); qmlRegisterUncreatableType<QAbstractItemModel>(private_uri, 1, 0, "AbstractItemModel", QLatin1String("AbstractItemModel is an abstract type.")); #ifdef QT_WIDGETS_LIB - qmlRegisterType<QQuickStyleItem>(private_uri, 1, 0, "StyleItem"); - engine->addImageProvider("__tablerow", new QQuickTableRowImageProvider); + qmlRegisterType<QQuickStyleItem1>(private_uri, 1, 0, "StyleItem"); + engine->addImageProvider("__tablerow", new QQuickTableRowImageProvider1); #endif - engine->addImageProvider("desktoptheme", new QQuickDesktopIconProvider); + engine->addImageProvider("desktoptheme", new QQuickDesktopIconProvider1); if (isLoadedFromResource()) engine->addImportPath(QStringLiteral("qrc:/")); @@ -186,15 +194,24 @@ void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri #endif } -QString QtQuickControlsPlugin::fileLocation() const +QString QtQuickControls1Plugin::fileLocation() const { +#ifndef QT_STATIC if (isLoadedFromResource()) return "qrc:/QtQuick/Controls"; return baseUrl().toString(); +#else + return "qrc:/qt-project.org/imports/QtQuick/Controls"; +#endif } -bool QtQuickControlsPlugin::isLoadedFromResource() const +bool QtQuickControls1Plugin::isLoadedFromResource() const { +#ifdef QT_STATIC + // When static it is included automatically + // for us. + return false; +#endif #if defined(ALWAYS_LOAD_FROM_RESOURCES) return true; #else diff --git a/src/controls/plugin.h b/src/controls/plugin.h index 47dc3b06..089d752f 100644 --- a/src/controls/plugin.h +++ b/src/controls/plugin.h @@ -50,11 +50,12 @@ QT_BEGIN_NAMESPACE -class QtQuickControlsPlugin: public QQmlExtensionPlugin +class QtQuickControls1Plugin: public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QtQuickControls1Plugin(QObject *parent = 0); void registerTypes(const char *uri); void initializeEngine(QQmlEngine *engine, const char *uri); private: diff --git a/src/controls/qmldir b/src/controls/qmldir index a07b4b99..9f35da29 100644 --- a/src/controls/qmldir +++ b/src/controls/qmldir @@ -1,6 +1,6 @@ module QtQuick.Controls plugin qtquickcontrolsplugin -classname QtQuickControlsPlugin +classname QtQuickControls1Plugin typeinfo plugins.qmltypes designersupported depends QtQuick.Window 2.2 diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp index 833d591c..f04b13ab 100644 --- a/src/controls/qquickaction.cpp +++ b/src/controls/qquickaction.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Action - \instantiates QQuickAction + \instantiates QQuickAction1 \ingroup applicationwindow \ingroup controls \inqmlmodule QtQuick.Controls @@ -191,7 +191,7 @@ QT_BEGIN_NAMESPACE The corresponding handler is \c onToggled. */ -QQuickAction::QQuickAction(QObject *parent) +QQuickAction1::QQuickAction1(QObject *parent) : QObject(parent) , m_enabled(true) , m_checkable(false) @@ -199,14 +199,14 @@ QQuickAction::QQuickAction(QObject *parent) { } -QQuickAction::~QQuickAction() +QQuickAction1::~QQuickAction1() { setShortcut(QString()); setMnemonicFromText(QString()); setExclusiveGroup(0); } -void QQuickAction::setText(const QString &text) +void QQuickAction1::setText(const QString &text) { if (text == m_text) return; @@ -219,7 +219,7 @@ namespace { bool qShortcutContextMatcher(QObject *o, Qt::ShortcutContext context) { - if (!static_cast<QQuickAction*>(o)->isEnabled()) + if (!static_cast<QQuickAction1*>(o)->isEnabled()) return false; switch (context) { @@ -245,7 +245,7 @@ bool qShortcutContextMatcher(QObject *o, Qt::ShortcutContext context) bool qMnemonicContextMatcher(QObject *o, Qt::ShortcutContext context) { - if (!static_cast<QQuickAction*>(o)->isEnabled()) + if (!static_cast<QQuickAction1*>(o)->isEnabled()) return false; switch (context) { @@ -257,7 +257,7 @@ bool qMnemonicContextMatcher(QObject *o, Qt::ShortcutContext context) w = w->parent(); if (QQuickItem * item = qobject_cast<QQuickItem*>(w)) w = item->window(); - else if (QQuickMenuBase *mb = qobject_cast<QQuickMenuBase *>(w)) { + else if (QQuickMenuBase1 *mb = qobject_cast<QQuickMenuBase1 *>(w)) { QQuickItem *vi = mb->visualItem(); if (vi && vi->isVisible()) w = vi->window(); @@ -278,12 +278,12 @@ bool qMnemonicContextMatcher(QObject *o, Qt::ShortcutContext context) } // namespace -QVariant QQuickAction::shortcut() const +QVariant QQuickAction1::shortcut() const { return m_shortcut.toString(QKeySequence::NativeText); } -void QQuickAction::setShortcut(const QVariant &arg) +void QQuickAction1::setShortcut(const QVariant &arg) { QKeySequence sequence; if (arg.type() == QVariant::Int) @@ -306,7 +306,7 @@ void QQuickAction::setShortcut(const QVariant &arg) emit shortcutChanged(shortcut()); } -void QQuickAction::setMnemonicFromText(const QString &text) +void QQuickAction1::setMnemonicFromText(const QString &text) { QKeySequence sequence = QKeySequence::mnemonic(text); if (m_mnemonic == sequence) @@ -323,7 +323,7 @@ void QQuickAction::setMnemonicFromText(const QString &text) } } -void QQuickAction::setIconSource(const QUrl &iconSource) +void QQuickAction1::setIconSource(const QUrl &iconSource) { if (iconSource == m_iconSource) return; @@ -338,12 +338,12 @@ void QQuickAction::setIconSource(const QUrl &iconSource) emit iconSourceChanged(); } -QString QQuickAction::iconName() const +QString QQuickAction1::iconName() const { return m_iconName; } -void QQuickAction::setIconName(const QString &iconName) +void QQuickAction1::setIconName(const QString &iconName) { if (iconName == m_iconName) return; @@ -353,7 +353,7 @@ void QQuickAction::setIconName(const QString &iconName) emit iconChanged(); } -void QQuickAction::setTooltip(const QString &arg) +void QQuickAction1::setTooltip(const QString &arg) { if (m_tooltip != arg) { m_tooltip = arg; @@ -361,7 +361,7 @@ void QQuickAction::setTooltip(const QString &arg) } } -void QQuickAction::setEnabled(bool e) +void QQuickAction1::setEnabled(bool e) { if (e == m_enabled) return; @@ -370,7 +370,7 @@ void QQuickAction::setEnabled(bool e) emit enabledChanged(); } -void QQuickAction::setCheckable(bool c) +void QQuickAction1::setCheckable(bool c) { if (c == m_checkable) return; @@ -384,7 +384,7 @@ void QQuickAction::setCheckable(bool c) emit toggled(m_checkable); } -void QQuickAction::setChecked(bool c) +void QQuickAction1::setChecked(bool c) { if (c == m_checked) return; @@ -395,12 +395,12 @@ void QQuickAction::setChecked(bool c) emit toggled(m_checked); } -QQuickExclusiveGroup1 *QQuickAction::exclusiveGroup() const +QQuickExclusiveGroup1 *QQuickAction1::exclusiveGroup() const { return m_exclusiveGroup.data(); } -void QQuickAction::setExclusiveGroup(QQuickExclusiveGroup1 *eg) +void QQuickAction1::setExclusiveGroup(QQuickExclusiveGroup1 *eg) { if (m_exclusiveGroup == eg) return; @@ -414,7 +414,7 @@ void QQuickAction::setExclusiveGroup(QQuickExclusiveGroup1 *eg) emit exclusiveGroupChanged(); } -bool QQuickAction::event(QEvent *e) +bool QQuickAction1::event(QEvent *e) { if (!m_enabled) return false; @@ -437,7 +437,7 @@ bool QQuickAction::event(QEvent *e) return true; } -void QQuickAction::trigger(QObject *source) +void QQuickAction1::trigger(QObject *source) { if (!m_enabled) return; diff --git a/src/controls/qquickaction_p.h b/src/controls/qquickaction_p.h index b84a5332..711669e5 100644 --- a/src/controls/qquickaction_p.h +++ b/src/controls/qquickaction_p.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE class QQuickExclusiveGroup1; -class QQuickAction : public QObject +class QQuickAction1 : public QObject { Q_OBJECT @@ -70,8 +70,8 @@ class QQuickAction : public QObject #endif public: - explicit QQuickAction(QObject *parent = 0); - ~QQuickAction(); + explicit QQuickAction1(QObject *parent = 0); + ~QQuickAction1(); QString text() const { return m_text; } void resetText() { setText(QString()); } diff --git a/src/controls/qquickdesktopiconprovider_p.h b/src/controls/qquickdesktopiconprovider_p.h index 75281cd2..6e9e94a0 100644 --- a/src/controls/qquickdesktopiconprovider_p.h +++ b/src/controls/qquickdesktopiconprovider_p.h @@ -46,10 +46,10 @@ QT_BEGIN_NAMESPACE // Load icons from desktop theme -class QQuickDesktopIconProvider : public QQuickImageProvider +class QQuickDesktopIconProvider1 : public QQuickImageProvider { public: - QQuickDesktopIconProvider() + QQuickDesktopIconProvider1() : QQuickImageProvider(QQuickImageProvider::Pixmap) { } diff --git a/src/controls/qquickexclusivegroup.cpp b/src/controls/qquickexclusivegroup.cpp index 7d1b5b0b..14f17585 100644 --- a/src/controls/qquickexclusivegroup.cpp +++ b/src/controls/qquickexclusivegroup.cpp @@ -182,12 +182,12 @@ QQuickExclusiveGroup1::QQuickExclusiveGroup1(QObject *parent) m_updateCurrentMethod = metaObject()->method(index); } -QQmlListProperty<QQuickAction> QQuickExclusiveGroup1::actions() +QQmlListProperty<QQuickAction1> QQuickExclusiveGroup1::actions() { - return QQmlListProperty<QQuickAction>(this, 0, &QQuickExclusiveGroup1::append_actions, 0, 0, 0); + return QQmlListProperty<QQuickAction1>(this, 0, &QQuickExclusiveGroup1::append_actions, 0, 0, 0); } -void QQuickExclusiveGroup1::append_actions(QQmlListProperty<QQuickAction> *list, QQuickAction *action) +void QQuickExclusiveGroup1::append_actions(QQmlListProperty<QQuickAction1> *list, QQuickAction1 *action) { if (QQuickExclusiveGroup1 *eg = qobject_cast<QQuickExclusiveGroup1 *>(list->object)) action->setExclusiveGroup(eg); diff --git a/src/controls/qquickexclusivegroup_p.h b/src/controls/qquickexclusivegroup_p.h index ee32a6f4..cfff753d 100644 --- a/src/controls/qquickexclusivegroup_p.h +++ b/src/controls/qquickexclusivegroup_p.h @@ -46,14 +46,14 @@ QT_BEGIN_NAMESPACE -class QQuickAction; +class QQuickAction1; class QQuickExclusiveGroup1 : public QObject { Q_OBJECT Q_PROPERTY(QObject *current READ current WRITE setCurrent NOTIFY currentChanged) - Q_PROPERTY(QQmlListProperty<QQuickAction> __actions READ actions) + Q_PROPERTY(QQmlListProperty<QQuickAction1> __actions READ actions) Q_CLASSINFO("DefaultProperty", "__actions") public: @@ -62,7 +62,7 @@ public: QObject *current() const { return m_current; } void setCurrent(QObject * o); - QQmlListProperty<QQuickAction> actions(); + QQmlListProperty<QQuickAction1> actions(); public Q_SLOTS: void bindCheckable(QObject *o); @@ -75,7 +75,7 @@ private Q_SLOTS: void updateCurrent(); private: - static void append_actions(QQmlListProperty<QQuickAction> *list, QQuickAction *action); + static void append_actions(QQmlListProperty<QQuickAction1> *list, QQuickAction1 *action); QObject * m_current; QMetaMethod m_updateCurrentMethod; diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index af651425..ddb25790 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE as children. It also supports \l Instantiator objects as long as the insertion is being done manually using \l insertItem(). - \code + \qml Menu { id: recentFilesMenu @@ -97,7 +97,8 @@ QT_BEGIN_NAMESPACE enabled: recentFilesModel.count > 0 onTriggered: recentFilesModel.clear() } - \endcode + } + \endqml Note that in this case, the \c index parameter passed to \l insertItem() is relative to the position of the \l Instantiator in the menu, as opposed to absolute position @@ -258,7 +259,7 @@ QT_BEGIN_NAMESPACE */ QQuickMenu1::QQuickMenu1(QObject *parent) - : QQuickMenuText(parent, QQuickMenuItemType::Menu), + : QQuickMenuText1(parent, QQuickMenuItemType1::Menu), m_platformMenu(0), m_itemsCount(0), m_selectedIndex(-1), @@ -291,7 +292,7 @@ QQuickMenu1::QQuickMenu1(QObject *parent) QQuickMenu1::~QQuickMenu1() { while (!m_menuItems.empty()) { - QQuickMenuBase *item = m_menuItems.takeFirst(); + QQuickMenuBase1 *item = m_menuItems.takeFirst(); if (item) item->setParentMenu(0); } @@ -312,7 +313,7 @@ void QQuickMenu1::syncParentMenuBar() void QQuickMenu1::setVisible(bool v) { - QQuickMenuBase::setVisible(v); + QQuickMenuBase1::setVisible(v); if (m_platformMenu) { m_platformMenu->setVisible(v); syncParentMenuBar(); @@ -321,7 +322,7 @@ void QQuickMenu1::setVisible(bool v) void QQuickMenu1::setEnabled(bool e) { - QQuickMenuText::setEnabled(e); + QQuickMenuText1::setEnabled(e); if (m_platformMenu) { m_platformMenu->setEnabled(e); syncParentMenuBar(); @@ -332,7 +333,7 @@ void QQuickMenu1::updateText() { if (m_platformMenu) m_platformMenu->setText(this->text()); - QQuickMenuText::updateText(); + QQuickMenuText1::updateText(); } void QQuickMenu1::setMinimumWidth(int w) @@ -432,7 +433,7 @@ void QQuickMenu1::__popup(const QRectF &targetRect, int atItemIndex, MenuType me setPopupVisible(true); - QQuickMenuBase *atItem = menuItemAtIndex(atItemIndex); + QQuickMenuBase1 *atItem = menuItemAtIndex(atItemIndex); QQuickWindow *quickWindow = findParentWindow(); QPoint renderOffset; @@ -453,7 +454,7 @@ void QQuickMenu1::__popup(const QRectF &targetRect, int atItemIndex, MenuType me m_platformMenu->setMenuType(QPlatformMenu::MenuType(menuType)); m_platformMenu->showPopup(parentWindow, globalTargetRect.toRect(), atItem ? atItem->platformItem() : 0); } else { - m_popupWindow = new QQuickMenuPopupWindow(this); + m_popupWindow = new QQuickMenuPopupWindow1(this); if (visualItem()) m_popupWindow->setParentItem(visualItem()); else @@ -523,11 +524,11 @@ void QQuickMenu1::hideMenu() m_parentWindow = 0; } -QQuickMenuPopupWindow *QQuickMenu1::topMenuPopup() const +QQuickMenuPopupWindow1 *QQuickMenu1::topMenuPopup() const { - QQuickMenuPopupWindow *topMenuWindow = m_popupWindow; + QQuickMenuPopupWindow1 *topMenuWindow = m_popupWindow; while (topMenuWindow) { - QQuickMenuPopupWindow *pw = qobject_cast<QQuickMenuPopupWindow *>(topMenuWindow->transientParent()); + QQuickMenuPopupWindow1 *pw = qobject_cast<QQuickMenuPopupWindow1 *>(topMenuWindow->transientParent()); if (!pw) return topMenuWindow; topMenuWindow = pw; @@ -546,7 +547,7 @@ void QQuickMenu1::__dismissMenu() { if (m_platformMenu) { m_platformMenu->dismiss(); - } else if (QQuickMenuPopupWindow *topPopup = topMenuPopup()) { + } else if (QQuickMenuPopupWindow1 *topPopup = topMenuPopup()) { topPopup->dismissPopup(); } } @@ -559,7 +560,7 @@ void QQuickMenu1::windowVisibleChanged(bool v) { if (!v) { if (m_popupWindow) { - QQuickMenuPopupWindow *parentMenuPopup = qobject_cast<QQuickMenuPopupWindow *>(m_popupWindow->transientParent()); + QQuickMenuPopupWindow1 *parentMenuPopup = qobject_cast<QQuickMenuPopupWindow1 *>(m_popupWindow->transientParent()); if (parentMenuPopup) { parentMenuPopup->setMouseGrabEnabled(true); parentMenuPopup->setKeyboardGrabEnabled(true); @@ -587,7 +588,7 @@ void QQuickMenu1::destroyMenuPopup() void QQuickMenu1::destroyAllMenuPopups() { if (m_triggerCount > 0) return; - QQuickMenuPopupWindow *popup = topMenuPopup(); + QQuickMenuPopupWindow1 *popup = topMenuPopup(); if (popup) popup->setToBeDeletedLater(); } @@ -624,9 +625,9 @@ void QQuickMenu1::__dismissAndDestroy() void QQuickMenu1::itemIndexToListIndex(int itemIndex, int *listIndex, int *containerIndex) const { *listIndex = -1; - QQuickMenuItemContainer *container = 0; + QQuickMenuItemContainer1 *container = 0; while (itemIndex >= 0 && ++*listIndex < m_menuItems.count()) - if ((container = qobject_cast<QQuickMenuItemContainer *>(m_menuItems[*listIndex]))) + if ((container = qobject_cast<QQuickMenuItemContainer1 *>(m_menuItems[*listIndex]))) itemIndex -= container->items().count(); else --itemIndex; @@ -642,7 +643,7 @@ int QQuickMenu1::itemIndexForListIndex(int listIndex) const int index = 0; int i = 0; while (i < listIndex && i < m_menuItems.count()) - if (QQuickMenuItemContainer *container = qobject_cast<QQuickMenuItemContainer *>(m_menuItems[i++])) + if (QQuickMenuItemContainer1 *container = qobject_cast<QQuickMenuItemContainer1 *>(m_menuItems[i++])) index += container->items().count(); else ++index; @@ -650,16 +651,16 @@ int QQuickMenu1::itemIndexForListIndex(int listIndex) const return index; } -QQuickMenuBase *QQuickMenu1::nextMenuItem(QQuickMenu1::MenuItemIterator *it) const +QQuickMenuBase1 *QQuickMenu1::nextMenuItem(QQuickMenu1::MenuItemIterator *it) const { if (it->containerIndex != -1) { - QQuickMenuItemContainer *container = qobject_cast<QQuickMenuItemContainer *>(m_menuItems[it->index]); + QQuickMenuItemContainer1 *container = qobject_cast<QQuickMenuItemContainer1 *>(m_menuItems[it->index]); if (++it->containerIndex < container->items().count()) return container->items()[it->containerIndex]; } if (++it->index < m_menuItems.count()) { - if (QQuickMenuItemContainer *container = qobject_cast<QQuickMenuItemContainer *>(m_menuItems[it->index])) { + if (QQuickMenuItemContainer1 *container = qobject_cast<QQuickMenuItemContainer1 *>(m_menuItems[it->index])) { it->containerIndex = 0; return container->items()[0]; } else { @@ -671,20 +672,20 @@ QQuickMenuBase *QQuickMenu1::nextMenuItem(QQuickMenu1::MenuItemIterator *it) con return 0; } -QQuickMenuBase *QQuickMenu1::menuItemAtIndex(int index) const +QQuickMenuBase1 *QQuickMenu1::menuItemAtIndex(int index) const { if (0 <= index && index < m_itemsCount) { if (!m_containersCount) { return m_menuItems[index]; } else if (m_containersCount == 1 && m_menuItems.count() == 1) { - QQuickMenuItemContainer *container = qobject_cast<QQuickMenuItemContainer *>(m_menuItems[0]); + QQuickMenuItemContainer1 *container = qobject_cast<QQuickMenuItemContainer1 *>(m_menuItems[0]); return container->items()[index]; } else { int containerIndex; int i; itemIndexToListIndex(index, &i, &containerIndex); if (containerIndex != -1) { - QQuickMenuItemContainer *container = qobject_cast<QQuickMenuItemContainer *>(m_menuItems[i]); + QQuickMenuItemContainer1 *container = qobject_cast<QQuickMenuItemContainer1 *>(m_menuItems[i]); return container->items()[containerIndex]; } else { return m_menuItems[i]; @@ -695,7 +696,7 @@ QQuickMenuBase *QQuickMenu1::menuItemAtIndex(int index) const return 0; } -bool QQuickMenu1::contains(QQuickMenuBase *item) +bool QQuickMenu1::contains(QQuickMenuBase1 *item) { if (item->container()) return item->container()->items().contains(item); @@ -703,7 +704,7 @@ bool QQuickMenu1::contains(QQuickMenuBase *item) return m_menuItems.contains(item); } -int QQuickMenu1::indexOfMenuItem(QQuickMenuBase *item) const +int QQuickMenu1::indexOfMenuItem(QQuickMenuBase1 *item) const { if (!item) return -1; @@ -739,17 +740,17 @@ void QQuickMenu1::addSeparator() void QQuickMenu1::insertSeparator(int index) { - QQuickMenuSeparator *item = new QQuickMenuSeparator(this); + QQuickMenuSeparator1 *item = new QQuickMenuSeparator1(this); insertItem(index, item); } -void QQuickMenu1::insertItem(int index, QQuickMenuBase *menuItem) +void QQuickMenu1::insertItem(int index, QQuickMenuBase1 *menuItem) { if (!menuItem) return; int itemIndex; if (m_containersCount) { - QQuickMenuItemContainer *container = menuItem->parent() != this ? m_containers[menuItem->parent()] : 0; + QQuickMenuItemContainer1 *container = menuItem->parent() != this ? m_containers[menuItem->parent()] : 0; if (container) { container->insertItem(index, menuItem); itemIndex = itemIndexForListIndex(m_menuItems.indexOf(container)) + index; @@ -766,13 +767,13 @@ void QQuickMenu1::insertItem(int index, QQuickMenuBase *menuItem) emit itemsChanged(); } -void QQuickMenu1::removeItem(QQuickMenuBase *menuItem) +void QQuickMenu1::removeItem(QQuickMenuBase1 *menuItem) { if (!menuItem) return; menuItem->setParentMenu(0); - QQuickMenuItemContainer *container = menuItem->parent() != this ? m_containers[menuItem->parent()] : 0; + QQuickMenuItemContainer1 *container = menuItem->parent() != this ? m_containers[menuItem->parent()] : 0; if (container) container->removeItem(menuItem); else @@ -797,7 +798,7 @@ void QQuickMenu1::clear() m_itemsCount = 0; } -void QQuickMenu1::setupMenuItem(QQuickMenuBase *item, int platformIndex) +void QQuickMenu1::setupMenuItem(QQuickMenuBase1 *item, int platformIndex) { item->setParentMenu(this); if (m_platformMenu) { @@ -812,18 +813,18 @@ void QQuickMenu1::setupMenuItem(QQuickMenuBase *item, int platformIndex) void QQuickMenu1::append_menuItems(QQuickMenuItems *list, QObject *o) { if (QQuickMenu1 *menu = qobject_cast<QQuickMenu1 *>(list->object)) { - if (QQuickMenuBase *menuItem = qobject_cast<QQuickMenuBase *>(o)) { + if (QQuickMenuBase1 *menuItem = qobject_cast<QQuickMenuBase1 *>(o)) { menu->m_menuItems.append(menuItem); menu->setupMenuItem(menuItem); } else { - QQuickMenuItemContainer *menuItemContainer = new QQuickMenuItemContainer(menu); + QQuickMenuItemContainer1 *menuItemContainer = new QQuickMenuItemContainer1(menu); menu->m_menuItems.append(menuItemContainer); menu->m_containers.insert(o, menuItemContainer); menuItemContainer->setParentMenu(menu); ++menu->m_containersCount; const auto children = o->children(); for (QObject *child : children) { - if (QQuickMenuBase *item = qobject_cast<QQuickMenuBase *>(child)) { + if (QQuickMenuBase1 *item = qobject_cast<QQuickMenuBase1 *>(child)) { menuItemContainer->insertItem(-1, item); menu->setupMenuItem(item); } diff --git a/src/controls/qquickmenu_p.h b/src/controls/qquickmenu_p.h index 23be1446..a8a14c5a 100644 --- a/src/controls/qquickmenu_p.h +++ b/src/controls/qquickmenu_p.h @@ -51,14 +51,14 @@ QT_BEGIN_NAMESPACE class QPlatformMenu; -class QQuickMenuPopupWindow; -class QQuickMenuItemContainer; +class QQuickMenuPopupWindow1; +class QQuickMenuItemContainer1; class QQuickWindow; class QQuickMenuBar1; typedef QQmlListProperty<QObject> QQuickMenuItems; -class QQuickMenu1 : public QQuickMenuText +class QQuickMenu1 : public QQuickMenuText1 { Q_OBJECT Q_PROPERTY(QString title READ text WRITE setText NOTIFY titleChanged) @@ -72,7 +72,7 @@ class QQuickMenu1 : public QQuickMenuText Q_PROPERTY(QFont __font READ font WRITE setFont) Q_PROPERTY(qreal __xOffset READ xOffset WRITE setXOffset) Q_PROPERTY(qreal __yOffset READ yOffset WRITE setYOffset) - Q_PROPERTY(QQuickAction *__action READ action CONSTANT) + Q_PROPERTY(QQuickAction1 *__action READ action CONSTANT) Q_PROPERTY(QRect __popupGeometry READ popupGeometry NOTIFY __popupGeometryChanged) Q_PROPERTY(bool __isProxy READ isProxy WRITE setProxy NOTIFY __proxyChanged) Q_ENUMS(MenuType) @@ -87,8 +87,8 @@ public: Q_INVOKABLE void addSeparator(); Q_INVOKABLE void insertSeparator(int); - Q_INVOKABLE void insertItem(int, QQuickMenuBase *); - Q_INVOKABLE void removeItem(QQuickMenuBase *); + Q_INVOKABLE void insertItem(int, QQuickMenuBase1 *); + Q_INVOKABLE void removeItem(QQuickMenuBase1 *); Q_INVOKABLE void clear(); Q_INVOKABLE void __popup(const QRectF &targetRect, int atItemIndex = -1, MenuType menuType = DefaultMenu); @@ -124,9 +124,9 @@ public: void setSelectedIndex(int index); QQuickMenuItems menuItems(); - QQuickMenuBase *menuItemAtIndex(int index) const; - bool contains(QQuickMenuBase *); - int indexOfMenuItem(QQuickMenuBase *) const; + QQuickMenuBase1 *menuItemAtIndex(int index) const; + bool contains(QQuickMenuBase1 *); + int indexOfMenuItem(QQuickMenuBase1 *) const; QPlatformMenu *platformMenu() const { return m_platformMenu; } @@ -172,7 +172,7 @@ protected Q_SLOTS: private: QQuickWindow *findParentWindow(); void syncParentMenuBar(); - QQuickMenuPopupWindow *topMenuPopup() const; + QQuickMenuPopupWindow1 *topMenuPopup() const; int itemIndexForListIndex(int listIndex) const; void itemIndexToListIndex(int, int *, int *) const; @@ -183,23 +183,23 @@ private: int index, containerIndex; }; - QQuickMenuBase *nextMenuItem(MenuItemIterator *) const; + QQuickMenuBase1 *nextMenuItem(MenuItemIterator *) const; static void append_menuItems(QQuickMenuItems *list, QObject *o); static int count_menuItems(QQuickMenuItems *list); static QObject *at_menuItems(QQuickMenuItems *list, int index); static void clear_menuItems(QQuickMenuItems *list); - void setupMenuItem(QQuickMenuBase *item, int platformIndex = -1); + void setupMenuItem(QQuickMenuBase1 *item, int platformIndex = -1); QPlatformMenu *m_platformMenu; - QList<QQuickMenuBase *> m_menuItems; - QHash<QObject *, QQuickMenuItemContainer *> m_containers; + QList<QQuickMenuBase1 *> m_menuItems; + QHash<QObject *, QQuickMenuItemContainer1 *> m_containers; int m_itemsCount; int m_selectedIndex; int m_highlightedIndex; QQuickWindow *m_parentWindow; int m_minimumWidth; - QQuickMenuPopupWindow *m_popupWindow; + QQuickMenuPopupWindow1 *m_popupWindow; QQuickItem * m_menuContentItem; bool m_popupVisible; int m_containersCount; diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp index b4b40ae0..33acff9e 100644 --- a/src/controls/qquickmenuitem.cpp +++ b/src/controls/qquickmenuitem.cpp @@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE -QQuickMenuBase::QQuickMenuBase(QObject *parent, int type) - : QObject(parent), m_visible(true), m_type(static_cast<QQuickMenuItemType::MenuItemType>(type)) +QQuickMenuBase1::QQuickMenuBase1(QObject *parent, int type) + : QObject(parent), m_visible(true), m_type(static_cast<QQuickMenuItemType1::MenuItemType>(type)) , m_parentMenu(0), m_container(0), m_platformItem(0), m_visualItem(0) { if (type >= 0 && QGuiApplication::platformName() != QStringLiteral("xcb")) { // QTBUG-51372) @@ -60,7 +60,7 @@ QQuickMenuBase::QQuickMenuBase(QObject *parent, int type) } } -QQuickMenuBase::~QQuickMenuBase() +QQuickMenuBase1::~QQuickMenuBase1() { if (parentMenu()) parentMenu()->removeItem(this); @@ -71,7 +71,7 @@ QQuickMenuBase::~QQuickMenuBase() } } -void QQuickMenuBase::setVisible(bool v) +void QQuickMenuBase1::setVisible(bool v) { if (v != m_visible) { m_visible = v; @@ -85,19 +85,19 @@ void QQuickMenuBase::setVisible(bool v) } } -QObject *QQuickMenuBase::parentMenuOrMenuBar() const +QObject *QQuickMenuBase1::parentMenuOrMenuBar() const { if (!m_parentMenu) return parent(); return m_parentMenu; } -QQuickMenu1 *QQuickMenuBase::parentMenu() const +QQuickMenu1 *QQuickMenuBase1::parentMenu() const { return m_parentMenu; } -void QQuickMenuBase::setParentMenu(QQuickMenu1 *parentMenu) +void QQuickMenuBase1::setParentMenu(QQuickMenu1 *parentMenu) { if (m_platformItem && m_parentMenu && m_parentMenu->platformMenu()) m_parentMenu->platformMenu()->removeMenuItem(m_platformItem); @@ -105,17 +105,17 @@ void QQuickMenuBase::setParentMenu(QQuickMenu1 *parentMenu) m_parentMenu = parentMenu; } -QQuickMenuItemContainer *QQuickMenuBase::container() const +QQuickMenuItemContainer1 *QQuickMenuBase1::container() const { return m_container; } -void QQuickMenuBase::setContainer(QQuickMenuItemContainer *c) +void QQuickMenuBase1::setContainer(QQuickMenuItemContainer1 *c) { m_container = c; } -void QQuickMenuBase::syncWithPlatformMenu() +void QQuickMenuBase1::syncWithPlatformMenu() { QQuickMenu1 *menu = parentMenu(); if (menu && menu->platformMenu() && platformItem() @@ -123,19 +123,19 @@ void QQuickMenuBase::syncWithPlatformMenu() menu->platformMenu()->syncMenuItem(platformItem()); } -QQuickItem *QQuickMenuBase::visualItem() const +QQuickItem *QQuickMenuBase1::visualItem() const { return m_visualItem; } -void QQuickMenuBase::setVisualItem(QQuickItem *item) +void QQuickMenuBase1::setVisualItem(QQuickItem *item) { m_visualItem = item; } /*! \qmltype MenuSeparator - \instantiates QQuickMenuSeparator + \instantiates QQuickMenuSeparator1 \inqmlmodule QtQuick.Controls \ingroup menus \ingroup controls @@ -189,15 +189,15 @@ void QQuickMenuBase::setVisualItem(QQuickItem *item) This property is read-only and constant, and its value is \c MenuItemType.Separator. */ -QQuickMenuSeparator::QQuickMenuSeparator(QObject *parent) - : QQuickMenuBase(parent, QQuickMenuItemType::Separator) +QQuickMenuSeparator1::QQuickMenuSeparator1(QObject *parent) + : QQuickMenuBase1(parent, QQuickMenuItemType1::Separator) { if (platformItem()) platformItem()->setIsSeparator(true); } -QQuickMenuText::QQuickMenuText(QObject *parent, QQuickMenuItemType::MenuItemType type) - : QQuickMenuBase(parent, type), m_action(new QQuickAction(this)) +QQuickMenuText1::QQuickMenuText1(QObject *parent, QQuickMenuItemType1::MenuItemType type) + : QQuickMenuBase1(parent, type), m_action(new QQuickAction1(this)) { connect(m_action, SIGNAL(enabledChanged()), this, SLOT(updateEnabled())); connect(m_action, SIGNAL(textChanged()), this, SLOT(updateText())); @@ -207,57 +207,57 @@ QQuickMenuText::QQuickMenuText(QObject *parent, QQuickMenuItemType::MenuItemType connect(m_action, SIGNAL(iconSourceChanged()), this, SIGNAL(iconSourceChanged())); } -QQuickMenuText::~QQuickMenuText() +QQuickMenuText1::~QQuickMenuText1() { delete m_action; } -bool QQuickMenuText::enabled() const +bool QQuickMenuText1::enabled() const { return action()->isEnabled(); } -void QQuickMenuText::setEnabled(bool e) +void QQuickMenuText1::setEnabled(bool e) { action()->setEnabled(e); } -QString QQuickMenuText::text() const +QString QQuickMenuText1::text() const { return m_action->text(); } -void QQuickMenuText::setText(const QString &t) +void QQuickMenuText1::setText(const QString &t) { m_action->setText(t); } -QUrl QQuickMenuText::iconSource() const +QUrl QQuickMenuText1::iconSource() const { return m_action->iconSource(); } -void QQuickMenuText::setIconSource(const QUrl &iconSource) +void QQuickMenuText1::setIconSource(const QUrl &iconSource) { m_action->setIconSource(iconSource); } -QString QQuickMenuText::iconName() const +QString QQuickMenuText1::iconName() const { return m_action->iconName(); } -void QQuickMenuText::setIconName(const QString &iconName) +void QQuickMenuText1::setIconName(const QString &iconName) { m_action->setIconName(iconName); } -QIcon QQuickMenuText::icon() const +QIcon QQuickMenuText1::icon() const { return m_action->icon(); } -void QQuickMenuText::updateText() +void QQuickMenuText1::updateText() { if (platformItem()) { platformItem()->setText(text()); @@ -266,7 +266,7 @@ void QQuickMenuText::updateText() emit __textChanged(); } -void QQuickMenuText::updateEnabled() +void QQuickMenuText1::updateEnabled() { if (platformItem()) { platformItem()->setEnabled(enabled()); @@ -275,7 +275,7 @@ void QQuickMenuText::updateEnabled() emit enabledChanged(); } -void QQuickMenuText::updateIcon() +void QQuickMenuText1::updateIcon() { if (platformItem()) { platformItem()->setIcon(icon()); @@ -460,7 +460,7 @@ void QQuickMenuText::updateIcon() */ QQuickMenuItem1::QQuickMenuItem1(QObject *parent) - : QQuickMenuText(parent, QQuickMenuItemType::Item), m_boundAction(0) + : QQuickMenuText1(parent, QQuickMenuItemType1::Item), m_boundAction(0) { connect(this, SIGNAL(__textChanged()), this, SIGNAL(textChanged())); @@ -481,12 +481,12 @@ QQuickMenuItem1::~QQuickMenuItem1() void QQuickMenuItem1::setParentMenu(QQuickMenu1 *parentMenu) { - QQuickMenuText::setParentMenu(parentMenu); + QQuickMenuText1::setParentMenu(parentMenu); if (parentMenu) connect(this, SIGNAL(triggered()), parentMenu, SLOT(updateSelectedIndex())); } -void QQuickMenuItem1::bindToAction(QQuickAction *action) +void QQuickMenuItem1::bindToAction(QQuickAction1 *action) { m_boundAction = action; @@ -522,7 +522,7 @@ void QQuickMenuItem1::unbindFromAction(QObject *o) if (o == m_boundAction) m_boundAction = 0; - QQuickAction *action = qobject_cast<QQuickAction *>(o); + QQuickAction1 *action = qobject_cast<QQuickAction1 *>(o); if (!action) return; @@ -541,14 +541,14 @@ void QQuickMenuItem1::unbindFromAction(QObject *o) disconnect(action, SIGNAL(iconSourceChanged()), this, SIGNAL(iconSourceChanged())); } -QQuickAction *QQuickMenuItem1::action() const +QQuickAction1 *QQuickMenuItem1::action() const { if (m_boundAction) return m_boundAction; - return QQuickMenuText::action(); + return QQuickMenuText1::action(); } -void QQuickMenuItem1::setBoundAction(QQuickAction *a) +void QQuickMenuItem1::setBoundAction(QQuickAction1 *a) { if (a == m_boundAction) return; @@ -561,7 +561,7 @@ void QQuickMenuItem1::setBoundAction(QQuickAction *a) QString QQuickMenuItem1::text() const { - QString ownText = QQuickMenuText::text(); + QString ownText = QQuickMenuText1::text(); if (!ownText.isNull()) return ownText; return m_boundAction ? m_boundAction->text() : QString(); @@ -569,7 +569,7 @@ QString QQuickMenuItem1::text() const QUrl QQuickMenuItem1::iconSource() const { - QUrl ownIconSource = QQuickMenuText::iconSource(); + QUrl ownIconSource = QQuickMenuText1::iconSource(); if (!ownIconSource.isEmpty()) return ownIconSource; return m_boundAction ? m_boundAction->iconSource() : QUrl(); @@ -577,7 +577,7 @@ QUrl QQuickMenuItem1::iconSource() const QString QQuickMenuItem1::iconName() const { - QString ownIconName = QQuickMenuText::iconName(); + QString ownIconName = QQuickMenuText1::iconName(); if (!ownIconName.isEmpty()) return ownIconName; return m_boundAction ? m_boundAction->iconName() : QString(); @@ -585,7 +585,7 @@ QString QQuickMenuItem1::iconName() const QIcon QQuickMenuItem1::icon() const { - QIcon ownIcon = QQuickMenuText::icon(); + QIcon ownIcon = QQuickMenuText1::icon(); if (!ownIcon.isNull()) return ownIcon; return m_boundAction ? m_boundAction->icon() : QIcon(); diff --git a/src/controls/qquickmenuitem_p.h b/src/controls/qquickmenuitem_p.h index 5251fc5d..ae7ed0e6 100644 --- a/src/controls/qquickmenuitem_p.h +++ b/src/controls/qquickmenuitem_p.h @@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE class QUrl; class QPlatformMenuItem; class QQuickItem; -class QQuickAction; +class QQuickAction1; class QQuickExclusiveGroup1; class QQuickMenu1; -class QQuickMenuItemContainer; +class QQuickMenuItemContainer1; -class QQuickMenuItemType +class QQuickMenuItemType1 { Q_GADGET Q_ENUMS(MenuItemType) @@ -71,11 +71,11 @@ public: }; }; -class QQuickMenuBase: public QObject +class QQuickMenuBase1: public QObject { Q_OBJECT Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged) - Q_PROPERTY(QQuickMenuItemType::MenuItemType type READ type CONSTANT) + Q_PROPERTY(QQuickMenuItemType1::MenuItemType type READ type CONSTANT) Q_PROPERTY(QObject *__parentMenu READ parentMenuOrMenuBar CONSTANT) Q_PROPERTY(bool __isNative READ isNative CONSTANT) @@ -85,8 +85,8 @@ Q_SIGNALS: void visibleChanged(); public: - QQuickMenuBase(QObject *parent, int type); - ~QQuickMenuBase(); + QQuickMenuBase1(QObject *parent, int type); + ~QQuickMenuBase1(); bool visible() const { return m_visible; } virtual void setVisible(bool); @@ -95,8 +95,8 @@ public: QObject *parentMenuOrMenuBar() const; virtual void setParentMenu(QQuickMenu1 *parentMenu); - QQuickMenuItemContainer *container() const; - void setContainer(QQuickMenuItemContainer *); + QQuickMenuItemContainer1 *container() const; + void setContainer(QQuickMenuItemContainer1 *); inline QPlatformMenuItem *platformItem() { return m_platformItem; } void syncWithPlatformMenu(); @@ -104,26 +104,26 @@ public: QQuickItem *visualItem() const; void setVisualItem(QQuickItem *item); - QQuickMenuItemType::MenuItemType type() { return m_type; } + QQuickMenuItemType1::MenuItemType type() { return m_type; } virtual bool isNative() { return m_platformItem != 0; } private: bool m_visible; - QQuickMenuItemType::MenuItemType m_type; + QQuickMenuItemType1::MenuItemType m_type; QQuickMenu1 *m_parentMenu; - QQuickMenuItemContainer *m_container; + QQuickMenuItemContainer1 *m_container; QPlatformMenuItem *m_platformItem; QPointer<QQuickItem> m_visualItem; }; -class QQuickMenuSeparator : public QQuickMenuBase +class QQuickMenuSeparator1 : public QQuickMenuBase1 { Q_OBJECT public: - QQuickMenuSeparator(QObject *parent = 0); + QQuickMenuSeparator1(QObject *parent = 0); }; -class QQuickMenuText : public QQuickMenuBase +class QQuickMenuText1 : public QQuickMenuBase1 { Q_OBJECT Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) @@ -141,8 +141,8 @@ Q_SIGNALS: void __iconChanged(); public: - QQuickMenuText(QObject *parent, QQuickMenuItemType::MenuItemType type); - ~QQuickMenuText(); + QQuickMenuText1(QObject *parent, QQuickMenuItemType1::MenuItemType type); + ~QQuickMenuText1(); bool enabled() const; virtual void setEnabled(bool enabled); @@ -159,7 +159,7 @@ public: protected: virtual QIcon icon() const; - virtual QQuickAction *action() const { return m_action; } + virtual QQuickAction1 *action() const { return m_action; } protected Q_SLOTS: virtual void updateText(); @@ -167,10 +167,10 @@ protected Q_SLOTS: void updateIcon(); private: - QQuickAction *m_action; + QQuickAction1 *m_action; }; -class QQuickMenuItem1 : public QQuickMenuText +class QQuickMenuItem1 : public QQuickMenuText1 { Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) @@ -178,7 +178,7 @@ class QQuickMenuItem1 : public QQuickMenuText Q_PROPERTY(bool checked READ checked WRITE setChecked NOTIFY toggled) Q_PROPERTY(QQuickExclusiveGroup1 *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged) Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged) - Q_PROPERTY(QQuickAction *action READ boundAction WRITE setBoundAction NOTIFY actionChanged) + Q_PROPERTY(QQuickAction1 *action READ boundAction WRITE setBoundAction NOTIFY actionChanged) public Q_SLOTS: void trigger(); @@ -204,8 +204,8 @@ public: QUrl iconSource() const; QString iconName() const; - QQuickAction *boundAction() { return m_boundAction; } - void setBoundAction(QQuickAction *a); + QQuickAction1 *boundAction() { return m_boundAction; } + void setBoundAction(QQuickAction1 *a); QVariant shortcut() const; void setShortcut(const QVariant &shortcut); @@ -225,15 +225,15 @@ protected Q_SLOTS: void updateShortcut(); void updateCheckable(); void updateChecked(); - void bindToAction(QQuickAction *action); + void bindToAction(QQuickAction1 *action); void unbindFromAction(QObject *action); protected: QIcon icon() const; - QQuickAction *action() const; + QQuickAction1 *action() const; private: - QQuickAction *m_boundAction; + QQuickAction1 *m_boundAction; }; QT_END_NAMESPACE diff --git a/src/controls/qquickmenuitemcontainer_p.h b/src/controls/qquickmenuitemcontainer_p.h index 09a7332c..d0a2b560 100644 --- a/src/controls/qquickmenuitemcontainer_p.h +++ b/src/controls/qquickmenuitemcontainer_p.h @@ -45,15 +45,15 @@ QT_BEGIN_NAMESPACE -class QQuickMenuItemContainer : public QQuickMenuBase +class QQuickMenuItemContainer1 : public QQuickMenuBase1 { Q_OBJECT public: - explicit QQuickMenuItemContainer(QObject *parent = 0) - : QQuickMenuBase(parent, -1) + explicit QQuickMenuItemContainer1(QObject *parent = 0) + : QQuickMenuBase1(parent, -1) { } - ~QQuickMenuItemContainer() + ~QQuickMenuItemContainer1() { clear(); setParentMenu(0); @@ -61,12 +61,12 @@ public: void setParentMenu(QQuickMenu1 *parentMenu) { - QQuickMenuBase::setParentMenu(parentMenu); - for (QQuickMenuBase *item : qAsConst(m_menuItems)) + QQuickMenuBase1::setParentMenu(parentMenu); + for (QQuickMenuBase1 *item : qAsConst(m_menuItems)) item->setParentMenu(parentMenu); } - void insertItem(int index, QQuickMenuBase *item) + void insertItem(int index, QQuickMenuBase1 *item) { if (index == -1) index = m_menuItems.count(); @@ -74,14 +74,14 @@ public: item->setContainer(this); } - void removeItem(QQuickMenuBase *item) + void removeItem(QQuickMenuBase1 *item) { item->setParentMenu(0); item->setContainer(0); m_menuItems.removeOne(item); } - const QList<QPointer<QQuickMenuBase> > &items() + const QList<QPointer<QQuickMenuBase1> > &items() { return m_menuItems; } @@ -89,7 +89,7 @@ public: void clear() { while (!m_menuItems.empty()) { - QQuickMenuBase *item = m_menuItems.takeFirst(); + QQuickMenuBase1 *item = m_menuItems.takeFirst(); if (item) { item->setParentMenu(0); item->setContainer(0); @@ -98,7 +98,7 @@ public: } private: - QList<QPointer<QQuickMenuBase> > m_menuItems; + QList<QPointer<QQuickMenuBase1> > m_menuItems; }; QT_END_NAMESPACE diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp index 960de23d..937a5ea5 100644 --- a/src/controls/qquickmenupopupwindow.cpp +++ b/src/controls/qquickmenupopupwindow.cpp @@ -49,16 +49,16 @@ QT_BEGIN_NAMESPACE -QQuickMenuPopupWindow::QQuickMenuPopupWindow(QQuickMenu1 *menu) : +QQuickMenuPopupWindow1::QQuickMenuPopupWindow1(QQuickMenu1 *menu) : m_itemAt(0), m_logicalParentWindow(0), m_menu(menu) { } -void QQuickMenuPopupWindow::setParentItem(QQuickItem *item) +void QQuickMenuPopupWindow1::setParentItem(QQuickItem *item) { - QQuickPopupWindow::setParentItem(item); + QQuickPopupWindow1::setParentItem(item); if (item) { QWindow *parentWindow = item->window(); QWindow *renderWindow = QQuickRenderControl::renderWindowFor(static_cast<QQuickWindow *>(parentWindow)); @@ -66,7 +66,7 @@ void QQuickMenuPopupWindow::setParentItem(QQuickItem *item) } } -void QQuickMenuPopupWindow::setItemAt(QQuickItem *menuItem) +void QQuickMenuPopupWindow1::setItemAt(QQuickItem *menuItem) { if (m_itemAt) { disconnect(m_itemAt, SIGNAL(xChanged()), this, SLOT(updatePosition())); @@ -81,7 +81,7 @@ void QQuickMenuPopupWindow::setItemAt(QQuickItem *menuItem) } } -void QQuickMenuPopupWindow::setParentWindow(QWindow *effectiveParentWindow, QQuickWindow *parentWindow) +void QQuickMenuPopupWindow1::setParentWindow(QWindow *effectiveParentWindow, QQuickWindow *parentWindow) { while (effectiveParentWindow && effectiveParentWindow->parent()) effectiveParentWindow = effectiveParentWindow->parent(); @@ -89,7 +89,7 @@ void QQuickMenuPopupWindow::setParentWindow(QWindow *effectiveParentWindow, QQui setTransientParent(effectiveParentWindow); m_logicalParentWindow = parentWindow; if (parentWindow) { - if (QQuickMenuPopupWindow *pw = qobject_cast<QQuickMenuPopupWindow *>(parentWindow)) { + if (QQuickMenuPopupWindow1 *pw = qobject_cast<QQuickMenuPopupWindow1 *>(parentWindow)) { connect(pw, SIGNAL(popupDismissed()), this, SLOT(dismissPopup())); connect(pw, SIGNAL(willBeDeletedLater()), this, SLOT(setToBeDeletedLater())); } else { @@ -98,13 +98,13 @@ void QQuickMenuPopupWindow::setParentWindow(QWindow *effectiveParentWindow, QQui } } -void QQuickMenuPopupWindow::setToBeDeletedLater() +void QQuickMenuPopupWindow1::setToBeDeletedLater() { deleteLater(); emit willBeDeletedLater(); } -void QQuickMenuPopupWindow::setGeometry(int posx, int posy, int w, int h) +void QQuickMenuPopupWindow1::setGeometry(int posx, int posy, int w, int h) { QWindow *pw = transientParent(); if (!pw && parentItem()) @@ -114,7 +114,7 @@ void QQuickMenuPopupWindow::setGeometry(int posx, int posy, int w, int h) QRect g = pw->screen()->geometry(); if (posx + w > g.right()) { - if (qobject_cast<QQuickMenuPopupWindow *>(transientParent())) { + if (qobject_cast<QQuickMenuPopupWindow1 *>(transientParent())) { // reposition submenu window on the parent menu's left side int submenuOverlap = pw->x() + pw->width() - posx; posx -= pw->width() + w - 2 * submenuOverlap; @@ -131,7 +131,7 @@ void QQuickMenuPopupWindow::setGeometry(int posx, int posy, int w, int h) emit geometryChanged(); } -void QQuickMenuPopupWindow::updateSize() +void QQuickMenuPopupWindow1::updateSize() { const QQuickItem *contentItem = popupContentItem(); if (!contentItem) @@ -144,21 +144,21 @@ void QQuickMenuPopupWindow::updateSize() setGeometry(x, y, contentItem->width(), contentItem->height()); } -void QQuickMenuPopupWindow::updatePosition() +void QQuickMenuPopupWindow1::updatePosition() { QPointF newPos = position() + m_oldItemPos - m_itemAt->position(); m_initialPos += m_oldItemPos - m_itemAt->position(); setGeometry(newPos.x(), newPos.y(), width(), height()); } -void QQuickMenuPopupWindow::focusInEvent(QFocusEvent *e) +void QQuickMenuPopupWindow1::focusInEvent(QFocusEvent *e) { QQuickWindow::focusInEvent(e); if (m_menu && m_menu->menuContentItem()) m_menu->menuContentItem()->forceActiveFocus(); } -void QQuickMenuPopupWindow::exposeEvent(QExposeEvent *e) +void QQuickMenuPopupWindow1::exposeEvent(QExposeEvent *e) { // the popup will reposition at the last moment, so its // initial position must be captured for updateSize(). @@ -167,18 +167,18 @@ void QQuickMenuPopupWindow::exposeEvent(QExposeEvent *e) // This must be a QQuickWindow embedded via createWindowContainer. m_initialPos += m_logicalParentWindow->geometry().topLeft(); } - QQuickPopupWindow::exposeEvent(e); + QQuickPopupWindow1::exposeEvent(e); if (isExposed()) updateSize(); } -QQuickMenu1 *QQuickMenuPopupWindow::menu() const +QQuickMenu1 *QQuickMenuPopupWindow1::menu() const { return m_menu; } -bool QQuickMenuPopupWindow::shouldForwardEventAfterDismiss(QMouseEvent *e) const +bool QQuickMenuPopupWindow1::shouldForwardEventAfterDismiss(QMouseEvent *e) const { // If the event falls inside this item the event should not be forwarded. // For example for comboboxes or top menus of the menubar diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h index adcfc6bb..8ec6aa5c 100644 --- a/src/controls/qquickmenupopupwindow_p.h +++ b/src/controls/qquickmenupopupwindow_p.h @@ -47,11 +47,11 @@ QT_BEGIN_NAMESPACE class QQuickMenu1; class QQuickMenuBar1; -class QQuickMenuPopupWindow : public QQuickPopupWindow +class QQuickMenuPopupWindow1 : public QQuickPopupWindow1 { Q_OBJECT public: - QQuickMenuPopupWindow(QQuickMenu1 *menu); + QQuickMenuPopupWindow1(QQuickMenu1 *menu); void setItemAt(QQuickItem *menuItem); void setParentWindow(QWindow *effectiveParentWindow, QQuickWindow *parentWindow); diff --git a/src/controls/qquickpopupwindow.cpp b/src/controls/qquickpopupwindow.cpp index defac701..6d87ac47 100644 --- a/src/controls/qquickpopupwindow.cpp +++ b/src/controls/qquickpopupwindow.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -QQuickPopupWindow::QQuickPopupWindow() : +QQuickPopupWindow1::QQuickPopupWindow1() : QQuickWindow(), m_parentItem(0), m_contentItem(0), m_mouseMoved(false), m_needsActivatedEvent(true), m_dismissed(false), m_pressed(false) @@ -56,13 +56,13 @@ QQuickPopupWindow::QQuickPopupWindow() : this, SLOT(applicationStateChanged(Qt::ApplicationState))); } -void QQuickPopupWindow::applicationStateChanged(Qt::ApplicationState state) +void QQuickPopupWindow1::applicationStateChanged(Qt::ApplicationState state) { if (state != Qt::ApplicationActive) dismissPopup(); } -void QQuickPopupWindow::show() +void QQuickPopupWindow1::show() { qreal posx = x(); qreal posy = y(); @@ -99,7 +99,7 @@ void QQuickPopupWindow::show() } emit geometryChanged(); - if (!qobject_cast<QQuickPopupWindow *>(transientParent())) { // No need for parent menu windows + if (!qobject_cast<QQuickPopupWindow1 *>(transientParent())) { // No need for parent menu windows if (QQuickWindow *w = qobject_cast<QQuickWindow *>(transientParent())) { if (QQuickItem *mg = w->mouseGrabberItem()) mg->ungrabMouse(); @@ -113,14 +113,14 @@ void QQuickPopupWindow::show() setKeyboardGrabEnabled(true); } -void QQuickPopupWindow::setParentItem(QQuickItem *item) +void QQuickPopupWindow1::setParentItem(QQuickItem *item) { m_parentItem = item; if (m_parentItem) setTransientParent(m_parentItem->window()); } -void QQuickPopupWindow::setPopupContentItem(QQuickItem *contentItem) +void QQuickPopupWindow1::setPopupContentItem(QQuickItem *contentItem) { if (!contentItem) return; @@ -131,20 +131,20 @@ void QQuickPopupWindow::setPopupContentItem(QQuickItem *contentItem) m_contentItem = contentItem; } -void QQuickPopupWindow::updateSize() +void QQuickPopupWindow1::updateSize() { setGeometry(x(), y(), popupContentItem()->width(), popupContentItem()->height()); emit geometryChanged(); } -void QQuickPopupWindow::dismissPopup() +void QQuickPopupWindow1::dismissPopup() { m_dismissed = true; emit popupDismissed(); hide(); } -void QQuickPopupWindow::mouseMoveEvent(QMouseEvent *e) +void QQuickPopupWindow1::mouseMoveEvent(QMouseEvent *e) { QRect rect = QRect(QPoint(), size()); m_mouseMoved = true; @@ -157,7 +157,7 @@ void QQuickPopupWindow::mouseMoveEvent(QMouseEvent *e) forwardEventToTransientParent(e); } -void QQuickPopupWindow::mousePressEvent(QMouseEvent *e) +void QQuickPopupWindow1::mousePressEvent(QMouseEvent *e) { m_pressed = true; QRect rect = QRect(QPoint(), size()); @@ -168,7 +168,7 @@ void QQuickPopupWindow::mousePressEvent(QMouseEvent *e) forwardEventToTransientParent(e); } -void QQuickPopupWindow::mouseReleaseEvent(QMouseEvent *e) +void QQuickPopupWindow1::mouseReleaseEvent(QMouseEvent *e) { QRect rect = QRect(QPoint(), size()); if (rect.contains(e->pos())) { @@ -186,11 +186,11 @@ void QQuickPopupWindow::mouseReleaseEvent(QMouseEvent *e) m_pressed = false; } -void QQuickPopupWindow::forwardEventToTransientParent(QMouseEvent *e) +void QQuickPopupWindow1::forwardEventToTransientParent(QMouseEvent *e) { bool forwardEvent = true; - if (!qobject_cast<QQuickPopupWindow*>(transientParent()) + if (!qobject_cast<QQuickPopupWindow1*>(transientParent()) && ((m_mouseMoved && e->type() == QEvent::MouseButtonRelease) || e->type() == QEvent::MouseButtonPress)) { // Clicked outside any popup @@ -205,12 +205,12 @@ void QQuickPopupWindow::forwardEventToTransientParent(QMouseEvent *e) } } -bool QQuickPopupWindow::shouldForwardEventAfterDismiss(QMouseEvent*) const +bool QQuickPopupWindow1::shouldForwardEventAfterDismiss(QMouseEvent*) const { return false; } -void QQuickPopupWindow::exposeEvent(QExposeEvent *e) +void QQuickPopupWindow1::exposeEvent(QExposeEvent *e) { if (isExposed() && m_needsActivatedEvent) { m_needsActivatedEvent = false; @@ -223,7 +223,7 @@ void QQuickPopupWindow::exposeEvent(QExposeEvent *e) QQuickWindow::exposeEvent(e); } -void QQuickPopupWindow::hideEvent(QHideEvent *e) +void QQuickPopupWindow1::hideEvent(QHideEvent *e) { if (QWindow *tp = !m_needsActivatedEvent ? transientParent() : 0) { m_needsActivatedEvent = true; @@ -234,14 +234,14 @@ void QQuickPopupWindow::hideEvent(QHideEvent *e) } /*! \reimp */ -bool QQuickPopupWindow::event(QEvent *event) +bool QQuickPopupWindow1::event(QEvent *event) { //QTBUG-45079 //This is a workaround for popup menu not being closed when using touch input. //Currently mouse synthesized events are not created for touch events which are //outside the qquickwindow. - if (event->type() == QEvent::TouchBegin && !qobject_cast<QQuickPopupWindow*>(transientParent())) { + if (event->type() == QEvent::TouchBegin && !qobject_cast<QQuickPopupWindow1*>(transientParent())) { QRect rect = QRect(QPoint(), size()); QTouchEvent *touch = static_cast<QTouchEvent*>(event); QTouchEvent::TouchPoint point = touch->touchPoints().first(); diff --git a/src/controls/qquickpopupwindow_p.h b/src/controls/qquickpopupwindow_p.h index 5b0c6045..1725bbe0 100644 --- a/src/controls/qquickpopupwindow_p.h +++ b/src/controls/qquickpopupwindow_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -class QQuickPopupWindow : public QQuickWindow +class QQuickPopupWindow1 : public QQuickWindow { Q_OBJECT Q_PROPERTY(QQuickItem *popupContentItem READ popupContentItem WRITE setPopupContentItem) @@ -54,7 +54,7 @@ class QQuickPopupWindow : public QQuickWindow Q_PROPERTY(QQuickItem *parentItem READ parentItem WRITE setParentItem) public: - QQuickPopupWindow(); + QQuickPopupWindow1(); QQuickItem *popupContentItem() const { return m_contentItem; } void setPopupContentItem(QQuickItem *popupContentItem); diff --git a/src/controls/qquickselectionmode_p.h b/src/controls/qquickselectionmode_p.h index a6abf02e..8a531567 100644 --- a/src/controls/qquickselectionmode_p.h +++ b/src/controls/qquickselectionmode_p.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -class QQuickSelectionMode +class QQuickSelectionMode1 { Q_GADGET Q_ENUMS(SelectionMode) diff --git a/src/controls/qquickstack.cpp b/src/controls/qquickstack.cpp index eabff15a..ed6fdeac 100644 --- a/src/controls/qquickstack.cpp +++ b/src/controls/qquickstack.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Stack - \instantiates QQuickStack + \instantiates QQuickStack1 \inqmlmodule QtQuick.Controls \ingroup controls \brief Provides attached properties for items pushed onto a StackView. @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \sa StackView */ -QQuickStack::QQuickStack(QObject *object) +QQuickStack1::QQuickStack1(QObject *object) : QObject(object), m_index(-1), m_status(Inactive), @@ -63,9 +63,9 @@ QQuickStack::QQuickStack(QObject *object) { } -QQuickStack *QQuickStack::qmlAttachedProperties(QObject *object) +QQuickStack1 *QQuickStack1::qmlAttachedProperties(QObject *object) { - return new QQuickStack(object); + return new QQuickStack1(object); } /*! @@ -76,12 +76,12 @@ QQuickStack *QQuickStack::qmlAttachedProperties(QObject *object) so that \l{StackView::get()}{StackView.get(index)} will return the item itself. If \l{Stack::view}{view} is \c null, \a index will be \c -1. */ -int QQuickStack::index() const +int QQuickStack1::index() const { return m_index; } -void QQuickStack::setIndex(int index) +void QQuickStack1::setIndex(int index) { if (m_index != index) { m_index = index; @@ -101,12 +101,12 @@ void QQuickStack::setIndex(int index) \li \c Stack.Deactivating: the item is transitioning into becoming inactive \endlist */ -QQuickStack::Status QQuickStack::status() const +QQuickStack1::Status QQuickStack1::status() const { return m_status; } -void QQuickStack::setStatus(Status status) +void QQuickStack1::setStatus(Status status) { if (m_status != status) { m_status = status; @@ -121,12 +121,12 @@ void QQuickStack::setStatus(Status status) This property holds the StackView the item is in. If the item is not inside a StackView, \a view will be \c null. */ -QQuickItem *QQuickStack::view() const +QQuickItem *QQuickStack1::view() const { return m_view; } -void QQuickStack::setView(QQuickItem *view) +void QQuickStack1::setView(QQuickItem *view) { if (m_view != view) { m_view = view; diff --git a/src/controls/qquickstack_p.h b/src/controls/qquickstack_p.h index 5df1e9fb..5dabca6b 100644 --- a/src/controls/qquickstack_p.h +++ b/src/controls/qquickstack_p.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -class QQuickStack : public QObject +class QQuickStack1 : public QObject { Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged) @@ -56,9 +56,9 @@ class QQuickStack : public QObject Q_ENUMS(Status) public: - QQuickStack(QObject *object = 0); + QQuickStack1(QObject *object = 0); - static QQuickStack *qmlAttachedProperties(QObject *object); + static QQuickStack1 *qmlAttachedProperties(QObject *object); int index() const; void setIndex(int index); @@ -89,7 +89,7 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickStack) -QML_DECLARE_TYPEINFO(QQuickStack, QML_HAS_ATTACHED_PROPERTIES) +QML_DECLARE_TYPE(QQuickStack1) +QML_DECLARE_TYPEINFO(QQuickStack1, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKSTACK_P_H diff --git a/src/dialogs/Private/dialogsprivateplugin.cpp b/src/dialogs/Private/dialogsprivateplugin.cpp index 769dc892..e9b39e05 100644 --- a/src/dialogs/Private/dialogsprivateplugin.cpp +++ b/src/dialogs/Private/dialogsprivateplugin.cpp @@ -42,6 +42,13 @@ #include "qquickwritingsystemlistmodel_p.h" #include "qquickfontlistmodel_p.h" +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_Dialogs_Private); +#endif +} + QT_BEGIN_NAMESPACE class QtQuick2DialogsPrivatePlugin : public QQmlExtensionPlugin @@ -50,6 +57,7 @@ class QtQuick2DialogsPrivatePlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QtQuick2DialogsPrivatePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Dialogs.Private")); diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro index 9daaa6e6..f19283f2 100644 --- a/src/dialogs/dialogs.pro +++ b/src/dialogs/dialogs.pro @@ -80,29 +80,32 @@ ios|android|blackberry|winrt { QT += quick-private gui gui-private core core-private qml qml-private -# Create the resource file -GENERATED_RESOURCE_FILE = $$OUT_PWD/dialogs.qrc - -RESOURCE_CONTENT = \ - "<RCC>" \ - "<qresource prefix=\"/QtQuick/Dialogs\">" - -for(resourcefile, DIALOGS_QML_FILES) { - resourcefileabsolutepath = $$absolute_path($$resourcefile) - relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) - relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) - RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>" +!static { + # Create the resource file + GENERATED_RESOURCE_FILE = $$OUT_PWD/dialogs.qrc + + RESOURCE_CONTENT = \ + "<RCC>" \ + "<qresource prefix=\"/QtQuick/Dialogs\">" + + for(resourcefile, DIALOGS_QML_FILES) { + resourcefileabsolutepath = $$absolute_path($$resourcefile) + relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) + relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) + RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>" + } + + RESOURCE_CONTENT += \ + "</qresource>" \ + "</RCC>" + + write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") + + RESOURCES += $$GENERATED_RESOURCE_FILE + # In case of a debug build, deploy the QML files too + !qtquickcompiler:CONFIG(debug, debug|release): QML_FILES += $$DIALOGS_QML_FILES +} else { + QML_FILES += $$DIALOGS_QML_FILES } -RESOURCE_CONTENT += \ - "</qresource>" \ - "</RCC>" - -write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") - -RESOURCES += $$GENERATED_RESOURCE_FILE - -# In case of a debug build, deploy the QML files too -!qtquickcompiler:CONFIG(debug, debug|release): QML_FILES += $$DIALOGS_QML_FILES - load(qml_plugin) diff --git a/src/dialogs/images/checkers.png b/src/dialogs/images/checkers.png Binary files differindex 458d33de..72cb9f03 100644 --- a/src/dialogs/images/checkers.png +++ b/src/dialogs/images/checkers.png diff --git a/src/dialogs/images/window_border.png b/src/dialogs/images/window_border.png Binary files differindex 431af854..23c011d0 100644 --- a/src/dialogs/images/window_border.png +++ b/src/dialogs/images/window_border.png diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index e6ce5a6f..1ab6b581 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -64,7 +64,11 @@ Q_LOGGING_CATEGORY(lcRegistration, "qt.quick.dialogs.registration") static void initResources() { +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_Dialogs); +#else Q_INIT_RESOURCE(dialogs); +#endif } QT_BEGIN_NAMESPACE @@ -90,7 +94,7 @@ class QtQuick2DialogsPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: - QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { } + QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { initResources(); } virtual void initializeEngine(QQmlEngine *engine, const char * uri) { qCDebug(lcRegistration) << uri << m_decorationComponentUrl; @@ -99,16 +103,18 @@ public: } virtual void registerTypes(const char *uri) { - initResources(); - Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Dialogs")); bool hasTopLevelWindows = QGuiApplicationPrivate::platformIntegration()-> hasCapability(QPlatformIntegration::MultipleWindows); qCDebug(lcRegistration) << uri << "can use top-level windows?" << hasTopLevelWindows; QDir qmlDir(baseUrl().toLocalFile()); QDir widgetsDir(baseUrl().toLocalFile()); +#ifndef QT_STATIC widgetsDir.cd("../PrivateWidgets"); - +#endif +#ifdef QT_STATIC + m_useResources = false; +#else #ifndef ALWAYS_LOAD_FROM_RESOURCES // If at least one file was actually installed, then use installed qml files instead of resources. // This makes debugging and incremental development easier, whereas the "normal" installation @@ -116,10 +122,14 @@ public: if (qmlDir.exists(QString("DefaultFileDialog.qml"))) m_useResources = false; #endif +#endif m_decorationComponentUrl = m_useResources ? QUrl("qrc:/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml") : +#ifndef QT_STATIC QUrl::fromLocalFile(qmlDir.filePath(QString("qml/DefaultWindowDecoration.qml"))); - +#else + QUrl("qrc:/qt-project.org/imports/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml"); +#endif // Prefer the QPA dialog helpers if the platform supports them. // Else if there is a QWidget-based implementation, check whether it's // possible to instantiate it from Qt Quick. @@ -170,7 +180,11 @@ public: qmlRegisterType<QQuickDialog>(uri, 1, 2, "AbstractDialog"); // implementation wrapper QUrl dialogQmlPath = m_useResources ? QUrl("qrc:/QtQuick/Dialogs/DefaultDialogWrapper.qml") : +#ifndef QT_STATIC QUrl::fromLocalFile(qmlDir.filePath("DefaultDialogWrapper.qml")); +#else + QUrl("qrc:/qt-project.org/imports/QtQuick/Dialogs/DefaultDialogWrapper.qml"); +#endif qCDebug(lcRegistration) << " registering" << dialogQmlPath << "as Dialog"; qmlRegisterType(dialogQmlPath, uri, 1, 2, "Dialog"); } @@ -217,7 +231,12 @@ protected: QCoreApplication::instance()->inherits("QApplication")) { QUrl dialogQmlPath = m_useResources ? QUrl(QString("qrc:/QtQuick/Dialogs/Widget%1.qml").arg(qmlName)) : - QUrl::fromLocalFile(qmlDir.filePath(QString("Widget%1.qml").arg(qmlName))); +#ifndef QT_STATIC + QUrl::fromLocalFile(qmlDir.filePath(QString("Widget%1.qml").arg(qmlName))); +#else + QUrl(QString("qrc:/qt-project.org/imports/QtQuick/Dialogs/Widget%1.qml").arg(qmlName)); + Q_UNUSED(qmlDir); +#endif if (qmlRegisterType(dialogQmlPath, uri, versionMajor, versionMinor, qmlName) >= 0) { qCDebug(lcRegistration) << " registering" << qmlName << " as " << dialogQmlPath; return true; @@ -235,7 +254,12 @@ protected: qmlRegisterType<WrapperType>(uri, versionMajor, versionMinor, abstractTypeName); QUrl dialogQmlPath = m_useResources ? QUrl(QString("qrc:/QtQuick/Dialogs/Default%1.qml").arg(qmlName)) : +#ifndef QT_STATIC QUrl::fromLocalFile(qmlDir.filePath(QString("Default%1.qml").arg(qmlName))); +#else + QUrl(QString("qrc:/qt-project.org/imports/QtQuick/Dialogs/Default%1.qml").arg(qmlName)); + Q_UNUSED(qmlDir); +#endif qCDebug(lcRegistration) << " registering" << qmlName << " as " << dialogQmlPath; qmlRegisterType(dialogQmlPath, uri, versionMajor, versionMinor, qmlName); } diff --git a/src/dialogs/qmldir b/src/dialogs/qmldir index 03186563..e94f11dd 100644 --- a/src/dialogs/qmldir +++ b/src/dialogs/qmldir @@ -6,3 +6,4 @@ depends Qt.labs.folderlistmodel 1.0 depends Qt.labs.settings 1.0 depends QtQuick.Dialogs.Private 1.0 depends QtQuick.Controls 1.3 +depends QtQuick.PrivateWidgets 1.1 diff --git a/src/extras/Private/private.pri b/src/extras/Private/private.pri index 0e4f7a12..f0c31caa 100644 --- a/src/extras/Private/private.pri +++ b/src/extras/Private/private.pri @@ -12,7 +12,7 @@ SOURCES += \ $$PWD/qquickmousethief.cpp \ $$PWD/qquickmathutils.cpp -OTHER_FILES += \ +QML_FILES += \ $$PWD/qmldir \ $$PWD/CircularButton.qml \ $$PWD/CircularButtonStyleHelper.qml \ diff --git a/src/extras/Styles/Flat/Flat.pro b/src/extras/Styles/Flat/Flat.pro index 6f70c7a8..079c3cf5 100644 --- a/src/extras/Styles/Flat/Flat.pro +++ b/src/extras/Styles/Flat/Flat.pro @@ -61,7 +61,8 @@ FLAT_STYLE += \ $$PWD/fonts/OpenSans-Semibold.ttf \ $$PWD/fonts/LICENSE.txt \ -RESOURCES += flatstyle.qrc +!static:RESOURCES += flatstyle.qrc +else: QML_FILES += $$FLAT_STYLE CONFIG += no_cxx_module load(qml_plugin) diff --git a/src/extras/Styles/Flat/flatstyleplugin.cpp b/src/extras/Styles/Flat/flatstyleplugin.cpp index d9a30d34..5d88134b 100644 --- a/src/extras/Styles/Flat/flatstyleplugin.cpp +++ b/src/extras/Styles/Flat/flatstyleplugin.cpp @@ -47,9 +47,14 @@ static void initResources() { +#ifndef QT_STATIC Q_INIT_RESOURCE(flatstyle); +#else + Q_INIT_RESOURCE(qmake_QtQuick_Controls_Styles_Flat); +#endif } +#ifndef QT_STATIC extern "C" { Q_DECL_EXPORT bool qt_quick_controls_style_init() { @@ -62,19 +67,23 @@ extern "C" { return ":/ExtrasImports/QtQuick/Controls/Styles/Flat"; } } +#endif QT_BEGIN_NAMESPACE QtQuickExtrasStylesPlugin::QtQuickExtrasStylesPlugin(QObject *parent) : QQmlExtensionPlugin(parent) { + initResources(); } void QtQuickExtrasStylesPlugin::registerTypes(const char *uri) { - initResources(); - - const QString prefix = "qrc:/ExtrasImports/QtQuick/Controls/Styles/Flat/"; +#ifndef QT_STATIC + const QString prefix = "qrc:///ExtrasImports/QtQuick/Controls/Styles/Flat/"; +#else + const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Controls/Styles/Flat/"; +#endif // register version 1.0 qmlRegisterSingletonType(QUrl(prefix + "FlatStyle.qml"), uri, 1, 0, "FlatStyle"); qmlRegisterType(QUrl(prefix + "ApplicationWindowStyle.qml"), uri, 1, 0, "ApplicationWindowStyle"); diff --git a/src/extras/doc/images/circulargauge.png b/src/extras/doc/images/circulargauge.png Binary files differindex f88aa01f..b3957fe0 100644 --- a/src/extras/doc/images/circulargauge.png +++ b/src/extras/doc/images/circulargauge.png diff --git a/src/extras/doc/images/delaybutton-activated.png b/src/extras/doc/images/delaybutton-activated.png Binary files differindex d78d7738..ddb48ba0 100644 --- a/src/extras/doc/images/delaybutton-activated.png +++ b/src/extras/doc/images/delaybutton-activated.png diff --git a/src/extras/doc/images/delaybutton-progress.png b/src/extras/doc/images/delaybutton-progress.png Binary files differindex 07a13256..211af3df 100644 --- a/src/extras/doc/images/delaybutton-progress.png +++ b/src/extras/doc/images/delaybutton-progress.png diff --git a/src/extras/doc/images/delaybutton.png b/src/extras/doc/images/delaybutton.png Binary files differindex 510abc0b..39d243dc 100644 --- a/src/extras/doc/images/delaybutton.png +++ b/src/extras/doc/images/delaybutton.png diff --git a/src/extras/doc/images/dial.png b/src/extras/doc/images/dial.png Binary files differindex d0e4d5ac..248b60bc 100644 --- a/src/extras/doc/images/dial.png +++ b/src/extras/doc/images/dial.png diff --git a/src/extras/doc/images/piemenu.png b/src/extras/doc/images/piemenu.png Binary files differindex 95078eae..442e341c 100644 --- a/src/extras/doc/images/piemenu.png +++ b/src/extras/doc/images/piemenu.png diff --git a/src/extras/doc/images/statusindicator-active.png b/src/extras/doc/images/statusindicator-active.png Binary files differindex c5ebc09d..4bd7864f 100644 --- a/src/extras/doc/images/statusindicator-active.png +++ b/src/extras/doc/images/statusindicator-active.png diff --git a/src/extras/doc/images/statusindicator-green.png b/src/extras/doc/images/statusindicator-green.png Binary files differindex 88dcb1ed..a9fbceb8 100644 --- a/src/extras/doc/images/statusindicator-green.png +++ b/src/extras/doc/images/statusindicator-green.png diff --git a/src/extras/doc/images/statusindicator-inactive.png b/src/extras/doc/images/statusindicator-inactive.png Binary files differindex 27488d5e..e5205979 100644 --- a/src/extras/doc/images/statusindicator-inactive.png +++ b/src/extras/doc/images/statusindicator-inactive.png diff --git a/src/extras/doc/images/togglebutton-checked.png b/src/extras/doc/images/togglebutton-checked.png Binary files differindex d40b382b..0891d493 100644 --- a/src/extras/doc/images/togglebutton-checked.png +++ b/src/extras/doc/images/togglebutton-checked.png diff --git a/src/extras/doc/images/togglebutton-unchecked.png b/src/extras/doc/images/togglebutton-unchecked.png Binary files differindex 7db5b84b..ee27c038 100644 --- a/src/extras/doc/images/togglebutton-unchecked.png +++ b/src/extras/doc/images/togglebutton-unchecked.png diff --git a/src/extras/extras.pro b/src/extras/extras.pro index 4363ce00..ab2f69cd 100644 --- a/src/extras/extras.pro +++ b/src/extras/extras.pro @@ -30,7 +30,8 @@ include(designer/designer.pri) OTHER_FILES += doc/src/* -RESOURCES += extras.qrc +!static:RESOURCES += extras.qrc +else: QML_FILES += $$CONTROLS_QML_FILES TR_EXCLUDE += designer/* diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp index bcbec453..960102ab 100644 --- a/src/extras/plugin.cpp +++ b/src/extras/plugin.cpp @@ -50,7 +50,11 @@ static void initResources() { +#ifndef QT_STATIC Q_INIT_RESOURCE(extras); +#else + Q_INIT_RESOURCE(qmake_QtQuick_Extras); +#endif } QT_BEGIN_NAMESPACE @@ -65,12 +69,16 @@ static QObject *registerMathUtilsSingleton(QQmlEngine *engine, QJSEngine *jsEngi QtQuickExtrasPlugin::QtQuickExtrasPlugin(QObject *parent) : QQmlExtensionPlugin(parent) { + initResources(); } void QtQuickExtrasPlugin::registerTypes(const char *uri) { - initResources(); +#ifndef QT_STATIC const QString prefix = "qrc:///ExtrasImports/QtQuick/Extras"; +#else + const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras"; +#endif // Register public API. qmlRegisterUncreatableType<QQuickActivationMode>(uri, 1, 0, "ActivationMode", QLatin1String("Do not create objects of type ActivationMode")); // register 1.0 @@ -102,7 +110,11 @@ void QtQuickExtrasPlugin::initializeEngine(QQmlEngine *engine, const char *uri) qmlRegisterType<QQuickFlatProgressBar>("QtQuick.Extras.Private.CppUtils", 1, 1, "FlatProgressBar"); qmlRegisterSingletonType<QQuickMathUtils>("QtQuick.Extras.Private.CppUtils", 1, 0, "MathUtils", registerMathUtilsSingleton); +#ifndef QT_STATIC const QString prefix = "qrc:///ExtrasImports/QtQuick/Extras"; +#else + const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras"; +#endif const char *private_uri = "QtQuick.Extras.Private"; qmlRegisterType(QUrl(prefix + "/Private/CircularButton.qml"), private_uri, 1, 0, "CircularButton"); qmlRegisterType(QUrl(prefix + "/Private/CircularButtonStyleHelper.qml"), private_uri, 1, 0, "CircularButtonStyleHelper"); diff --git a/src/src.pro b/src/src.pro index 3850a354..36a3bd44 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += controls android: SUBDIRS += controls/Styles/Android -ios: SUBDIRS += controls/Styles/iOS +ios:!static: SUBDIRS += controls/Styles/iOS winrt: SUBDIRS += controls/Styles/WinRT SUBDIRS += extras diff --git a/src/widgets/widgetsplugin.cpp b/src/widgets/widgetsplugin.cpp index 7703f679..cb4fe8f8 100644 --- a/src/widgets/widgetsplugin.cpp +++ b/src/widgets/widgetsplugin.cpp @@ -44,6 +44,13 @@ #include "qquickqcolordialog_p.h" #include "qquickqfontdialog_p.h" +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_PrivateWidgets); +#endif +} + QT_BEGIN_NAMESPACE /*! @@ -71,6 +78,7 @@ class QtQuick2PrivateWidgetsPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QtQuick2PrivateWidgetsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.PrivateWidgets")); diff --git a/tests/auto/activeFocusOnTab/data/images/testIcon.png b/tests/auto/activeFocusOnTab/data/images/testIcon.png Binary files differindex 7ac5f840..82e429dd 100644 --- a/tests/auto/activeFocusOnTab/data/images/testIcon.png +++ b/tests/auto/activeFocusOnTab/data/images/testIcon.png diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 697bdac2..48612215 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -146,7 +146,7 @@ Item { var sliderDeltaRatio = 1; //(slider.maximumValue - slider.minimumValue)/slider.width var ratio = mouseRatio / sliderDeltaRatio - mouseWheel(slider, 5, 5, 20 * ratio, 0) + mouseWheel(slider, 5, 5, -20 * ratio, 0) compare(slider.value, 22) slider.maximumValue = 30 @@ -159,15 +159,15 @@ Item { compare(slider.value, 10) var previousValue = slider.value - mouseWheel(slider, 5, 5, 6 * ratio, 0) + mouseWheel(slider, 5, 5, -6 * ratio, 0) compare(slider.value, Math.round(previousValue + 6)) - mouseWheel(slider, 5, 5, -6 * ratio, 0) + mouseWheel(slider, 5, 5, 6 * ratio, 0) compare(slider.value, previousValue) // Reach maximum slider.value = 0 - mouseWheel(slider, 5, 5, 40 * ratio, 0) + mouseWheel(slider, 5, 5, -40 * ratio, 0) compare(slider.value, slider.maximumValue) slider.destroy() } diff --git a/tests/auto/extras/data/tst_piemenu.qml b/tests/auto/extras/data/tst_piemenu.qml index cfbaa279..dbb3db38 100644 --- a/tests/auto/extras/data/tst_piemenu.qml +++ b/tests/auto/extras/data/tst_piemenu.qml @@ -137,9 +137,9 @@ Item { root = pieMenuComponent.createObject(container); var mouseArea = root.mouseArea; var pieMenu = root.pieMenu; - currentIndexSignalSpy.signalName = "onCurrentIndexChanged" + currentIndexSignalSpy.signalName = "currentIndexChanged" currentIndexSignalSpy.target = pieMenu; - actionSignalSpy.signalName = "onActionTriggered"; + actionSignalSpy.signalName = "actionTriggered"; actionSignalSpy.target = root; compare(pieMenu.triggerMode, TriggerMode.TriggerOnClick); @@ -547,7 +547,7 @@ Item { compare(pieMenu.__style.endAngle, originalEndAngle); for (i = 0; i < data.indexVisibility.length; ++i) { - actionSignalSpy.signalName = "onActionTriggered"; + actionSignalSpy.signalName = "actionTriggered"; actionSignalSpy.target = root; compare(pieMenu.visible, false); @@ -712,7 +712,7 @@ Item { // Move over middle item mouseMove(root, 100, 50) compare(pieMenu.currentIndex, 1) - selectedAngleChangedSpy.signalName = "onSelectionAngleChanged" + selectedAngleChangedSpy.signalName = "selectionAngleChanged" selectedAngleChangedSpy.target = pieMenu; // Move outside the middle item without changing angle mouseMove(root, 100, 98) @@ -737,7 +737,7 @@ Item { if (pieMenu.__style.title) tryCompare(pieMenu.__panel.titleItem, "text", "Action 1"); - actionSignalSpy.signalName = "onActionTriggered"; + actionSignalSpy.signalName = "actionTriggered"; actionSignalSpy.target = root; mouseClick(root, 230, 145); compare(actionSignalSpy.count, 1); @@ -811,7 +811,7 @@ Item { tryCompare(pieMenuComponent, "status", Component.Ready); root = pieMenuComponent.createObject(container); var pieMenu = root.pieMenu; - actionSignalSpy.signalName = "onActionTriggered"; + actionSignalSpy.signalName = "actionTriggered"; actionSignalSpy.target = root; mouseClick(root, 0, 0, Qt.LeftButton); @@ -840,7 +840,7 @@ Item { tryCompare(pieMenuComponent, "status", Component.Ready); root = pieMenuComponent.createObject(container); pieMenu = root.pieMenu; - actionSignalSpy.signalName = "onActionTriggered"; + actionSignalSpy.signalName = "actionTriggered"; actionSignalSpy.target = root; mouseClick(root, 0, 0, Qt.LeftButton); diff --git a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp index dcb9b0c2..03927fc2 100644 --- a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp +++ b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp @@ -36,10 +36,10 @@ class tst_QQuickTreeModelAdaptor : public QObject Q_OBJECT public: - void compareData(int row, QQuickTreeModelAdaptor &tma, const QModelIndex &idx, TestModel &model, bool expanded = false); - void compareModels(QQuickTreeModelAdaptor &tma, TestModel &model); - void expandAndTest(const QModelIndex &idx, QQuickTreeModelAdaptor &tma, bool expandable, int expectedRowCountDifference); - void collapseAndTest(const QModelIndex &idx, QQuickTreeModelAdaptor &tma, bool expandable, int expectedRowCountDifference); + void compareData(int row, QQuickTreeModelAdaptor1 &tma, const QModelIndex &idx, TestModel &model, bool expanded = false); + void compareModels(QQuickTreeModelAdaptor1 &tma, TestModel &model); + void expandAndTest(const QModelIndex &idx, QQuickTreeModelAdaptor1 &tma, bool expandable, int expectedRowCountDifference); + void collapseAndTest(const QModelIndex &idx, QQuickTreeModelAdaptor1 &tma, bool expandable, int expectedRowCountDifference); private slots: void initTestCase(); @@ -87,18 +87,18 @@ void tst_QQuickTreeModelAdaptor::cleanup() { } -void tst_QQuickTreeModelAdaptor::compareData(int row, QQuickTreeModelAdaptor &tma, const QModelIndex &modelIdx, TestModel &model, bool expanded) +void tst_QQuickTreeModelAdaptor::compareData(int row, QQuickTreeModelAdaptor1 &tma, const QModelIndex &modelIdx, TestModel &model, bool expanded) { const QModelIndex &tmaIdx = tma.index(row); const int indexDepth = model.level(modelIdx) - model.level(tma.rootIndex()) - 1; QCOMPARE(tma.mapToModel(tmaIdx), modelIdx); QCOMPARE(tma.data(tmaIdx, Qt::DisplayRole).toString(), model.displayData(modelIdx)); - QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor::DepthRole).toInt(), indexDepth); - QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor::ExpandedRole).toBool(), expanded); - QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor::HasChildrenRole).toBool(), model.hasChildren(modelIdx)); + QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor1::DepthRole).toInt(), indexDepth); + QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor1::ExpandedRole).toBool(), expanded); + QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor1::HasChildrenRole).toBool(), model.hasChildren(modelIdx)); } -void tst_QQuickTreeModelAdaptor::expandAndTest(const QModelIndex &idx, QQuickTreeModelAdaptor &tma, bool expandable, +void tst_QQuickTreeModelAdaptor::expandAndTest(const QModelIndex &idx, QQuickTreeModelAdaptor1 &tma, bool expandable, int expectedRowCountDifference) { QSignalSpy rowsAboutToBeInsertedSpy(&tma, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); @@ -110,7 +110,7 @@ void tst_QQuickTreeModelAdaptor::expandAndTest(const QModelIndex &idx, QQuickTre QCOMPARE(tma.isExpanded(idx), expandable); const QModelIndex &tmaIdx = tma.index(tma.itemIndex(idx)); - QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor::ExpandedRole).toBool(), expandable); + QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor1::ExpandedRole).toBool(), expandable); if (expandable && expectedRowCountDifference != 0) { // Rows were added below the parent @@ -132,7 +132,7 @@ void tst_QQuickTreeModelAdaptor::expandAndTest(const QModelIndex &idx, QQuickTre const QVariantList &dataChangedArgs = dataChangedSpy.first(); QCOMPARE(dataChangedArgs.at(0).toModelIndex(), tmaIdx); QCOMPARE(dataChangedArgs.at(1).toModelIndex(), tmaIdx); - QCOMPARE(dataChangedArgs.at(2).value<QVector<int> >(), QVector<int>(1, QQuickTreeModelAdaptor::ExpandedRole)); + QCOMPARE(dataChangedArgs.at(2).value<QVector<int> >(), QVector<int>(1, QQuickTreeModelAdaptor1::ExpandedRole)); } else { QCOMPARE(tma.rowCount(), oldRowCount); QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0); @@ -140,7 +140,7 @@ void tst_QQuickTreeModelAdaptor::expandAndTest(const QModelIndex &idx, QQuickTre } } -void tst_QQuickTreeModelAdaptor::collapseAndTest(const QModelIndex &idx, QQuickTreeModelAdaptor &tma, +void tst_QQuickTreeModelAdaptor::collapseAndTest(const QModelIndex &idx, QQuickTreeModelAdaptor1 &tma, bool expandable, int expectedRowCountDifference) { QSignalSpy rowsAboutToBeRemovedSpy(&tma, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); @@ -153,7 +153,7 @@ void tst_QQuickTreeModelAdaptor::collapseAndTest(const QModelIndex &idx, QQuickT const QModelIndex &tmaIdx = tma.index(tma.itemIndex(idx)); if (tmaIdx.isValid()) - QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor::ExpandedRole).toBool(), false); + QCOMPARE(tma.data(tmaIdx, QQuickTreeModelAdaptor1::ExpandedRole).toBool(), false); if (expandable && expectedRowCountDifference != 0) { // Rows were removed below the parent @@ -173,7 +173,7 @@ void tst_QQuickTreeModelAdaptor::collapseAndTest(const QModelIndex &idx, QQuickT const QVariantList &dataChangedArgs = dataChangedSpy.first(); QCOMPARE(dataChangedArgs.at(0).toModelIndex(), tmaIdx); QCOMPARE(dataChangedArgs.at(1).toModelIndex(), tmaIdx); - QCOMPARE(dataChangedArgs.at(2).value<QVector<int> >(), QVector<int>(1, QQuickTreeModelAdaptor::ExpandedRole)); + QCOMPARE(dataChangedArgs.at(2).value<QVector<int> >(), QVector<int>(1, QQuickTreeModelAdaptor1::ExpandedRole)); } else { QCOMPARE(tma.rowCount(), oldRowCount); QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0); @@ -181,7 +181,7 @@ void tst_QQuickTreeModelAdaptor::collapseAndTest(const QModelIndex &idx, QQuickT } } -void tst_QQuickTreeModelAdaptor::compareModels(QQuickTreeModelAdaptor &tma, TestModel &model) +void tst_QQuickTreeModelAdaptor::compareModels(QQuickTreeModelAdaptor1 &tma, TestModel &model) { QModelIndex parent = tma.rootIndex(); QStack<QModelIndex> parents; @@ -214,7 +214,7 @@ void tst_QQuickTreeModelAdaptor::compareModels(QQuickTreeModelAdaptor &tma, Test void tst_QQuickTreeModelAdaptor::setModel() { TestModel model(5, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; QSignalSpy modelChangedSpy(&tma, SIGNAL(modelChanged(QAbstractItemModel*))); tma.setModel(&model); @@ -234,7 +234,7 @@ void tst_QQuickTreeModelAdaptor::setModel() void tst_QQuickTreeModelAdaptor::modelDestroyed() { TestModel *model = new TestModel(5, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; QSignalSpy modelChangedSpy(&tma, SIGNAL(modelChanged(QAbstractItemModel*))); tma.setModel(model); @@ -252,7 +252,7 @@ void tst_QQuickTreeModelAdaptor::modelDestroyed() void tst_QQuickTreeModelAdaptor::modelReset() { TestModel model(5, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); QSignalSpy modelAboutToBeResetSpy(&tma, SIGNAL(modelAboutToBeReset())); @@ -282,7 +282,7 @@ void tst_QQuickTreeModelAdaptor::rootIndex() { TestModel model(5, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); QVERIFY(!tma.rootIndex().isValid()); @@ -316,7 +316,7 @@ void tst_QQuickTreeModelAdaptor::dataAccess() { TestModel model(5, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); QCOMPARE(tma.rowCount(), model.rowCount()); @@ -338,7 +338,7 @@ void tst_QQuickTreeModelAdaptor::dataChange() { TestModel model(5, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); QSignalSpy dataChangedSpy(&tma, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>))); @@ -381,7 +381,7 @@ void tst_QQuickTreeModelAdaptor::groupedDataChange() const QModelIndex &topLeftIdx = model.index(1, 0); const QModelIndex &bottomRightIdx = model.index(7, 0); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); QSignalSpy dataChangedSpy(&tma, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>))); @@ -493,7 +493,7 @@ void tst_QQuickTreeModelAdaptor::expandAndCollapse() const QModelIndex &parentIdx = model.index(parentRow, 0); bool expandable = model.hasChildren(parentIdx); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); expandAndTest(parentIdx, tma, expandable, model.rowCount(parentIdx)); @@ -512,7 +512,7 @@ void tst_QQuickTreeModelAdaptor::expandAndCollapse2ndLevel() const QModelIndex &parentIdx = model.index(expandRows[i], 0); QVERIFY(model.hasChildren(parentIdx)); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); tma.expand(parentIdx); @@ -568,7 +568,7 @@ void tst_QQuickTreeModelAdaptor::layoutChange() const QModelIndex &idx = model.index(0, 0); const QModelIndex &idx2 = model.index(2, 0); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); // Nothing expanded @@ -687,7 +687,7 @@ void tst_QQuickTreeModelAdaptor::removeRows() QFETCH(int, expectedRemovedCount); TestModel model(ModelRowCount, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); const QModelIndex &expandParentIdx = expandParentRow == -1 ? QModelIndex() : model.index(expandParentRow, 0); @@ -726,7 +726,7 @@ void tst_QQuickTreeModelAdaptor::removeRows() void tst_QQuickTreeModelAdaptor::removeRowsChildrenAndParent() { TestModel model(ModelRowCount, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); // Expand the first node @@ -768,7 +768,7 @@ void tst_QQuickTreeModelAdaptor::removeRowsChildrenAndParent() void tst_QQuickTreeModelAdaptor::removeChildrenMoveParent() { TestModel model(ModelRowCount, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); // Expand the first node @@ -811,7 +811,7 @@ void tst_QQuickTreeModelAdaptor::removeChildrenMoveParent() void tst_QQuickTreeModelAdaptor::removeChildrenRelayoutParent() { TestModel model(ModelRowCount, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); // Expand the first node @@ -879,7 +879,7 @@ void tst_QQuickTreeModelAdaptor::insertRows() QFETCH(int, expectedInsertedCount); TestModel model(ModelRowCount, 1); - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); const QModelIndex &expandParentIdx = expandParentRow == -1 ? QModelIndex() : model.index(expandParentRow, 0); @@ -1040,7 +1040,7 @@ void tst_QQuickTreeModelAdaptor::moveRows() TestModel model(ModelRowCount, 1); model.alternateChildlessRows = false; - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); const QModelIndex &expandParentIdx = expandParentRow == -1 ? QModelIndex() : model.index(expandParentRow, 0); @@ -1159,7 +1159,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange() TestModel model(ModelRowCount, 1); model.alternateChildlessRows = false; - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); // NOTE: Some selections may look a bit cryptic. Insert a call to @@ -1327,7 +1327,7 @@ void tst_QQuickTreeModelAdaptor::hasChildrenEmit() { TestModel model(1, 1); model.alternateChildlessRows = false; - QQuickTreeModelAdaptor tma; + QQuickTreeModelAdaptor1 tma; tma.setModel(&model); QModelIndex root = model.index(0,0); diff --git a/tests/manual/images/checkered.png b/tests/manual/images/checkered.png Binary files differindex 12c8b54b..c34d5260 100644 --- a/tests/manual/images/checkered.png +++ b/tests/manual/images/checkered.png diff --git a/tests/manual/images/testIcon.png b/tests/manual/images/testIcon.png Binary files differindex 7ac5f840..82e429dd 100644 --- a/tests/manual/images/testIcon.png +++ b/tests/manual/images/testIcon.png |
