diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:53:11 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:53:11 +0100 |
commit | c5159ecfc36bc0f9bff45de78accd104b9637066 (patch) | |
tree | f63ce3effc703e23fb3f5e9ae3880e5759dfe8b0 | |
parent | 210b31fa48134ace767be47508b9918bcee9a22d (diff) | |
parent | 1b8836e00da53872bd3c285e5ab5ac8344ccd46c (diff) |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
src/imports/winextras/qquickjumplist.cpp
Change-Id: I2272b873c872bbabf7e274a478e3d16b92cdb434
24 files changed, 66 insertions, 34 deletions
@@ -1,15 +1,11 @@ # C++ objects and libs -*.slo -*.lo -*.o *.a *.la *.lai -*.so *.dll -*.dylib *.obj +*_wrapper.bat # Visual Studio generated files diff --git a/dist/changes-5.6.2 b/dist/changes-5.6.2 new file mode 100644 index 0000000..fb770f8 --- /dev/null +++ b/dist/changes-5.6.2 @@ -0,0 +1,24 @@ +Qt 5.6.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - Examples have been extended and improved. diff --git a/dist/changes-5.7.1 b/dist/changes-5.7.1 new file mode 100644 index 0000000..c9480b0 --- /dev/null +++ b/dist/changes-5.7.1 @@ -0,0 +1,24 @@ +Qt 5.7.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.7.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.7 series is binary compatible with the 5.6.x series. +Applications compiled for 5.6 will continue to run with 5.7. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/examples/winextras/musicplayer/images/musicplayer.ico b/examples/winextras/musicplayer/images/musicplayer.ico Binary files differdeleted file mode 100644 index fef1dee..0000000 --- a/examples/winextras/musicplayer/images/musicplayer.ico +++ /dev/null diff --git a/examples/winextras/musicplayer/images/musicplayer.png b/examples/winextras/musicplayer/images/musicplayer.png Binary files differdeleted file mode 100644 index ecbff0c..0000000 --- a/examples/winextras/musicplayer/images/musicplayer.png +++ /dev/null diff --git a/examples/winextras/musicplayer/images/qt-logo.ico b/examples/winextras/musicplayer/images/qt-logo.ico Binary files differnew file mode 100644 index 0000000..b5ac59b --- /dev/null +++ b/examples/winextras/musicplayer/images/qt-logo.ico diff --git a/examples/winextras/musicplayer/main.cpp b/examples/winextras/musicplayer/main.cpp index 6a74bca..1386da5 100644 --- a/examples/winextras/musicplayer/main.cpp +++ b/examples/winextras/musicplayer/main.cpp @@ -97,7 +97,6 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationName(QStringLiteral("QtWinExtras")); QCoreApplication::setOrganizationDomain("qt-project.org"); QGuiApplication::setApplicationDisplayName(QStringLiteral("QtWinExtras Music Player")); - QApplication::setWindowIcon(QIcon(QStringLiteral(":/logo.png"))); if (!associateFileTypes()) return -1; diff --git a/examples/winextras/musicplayer/musicplayer.pro b/examples/winextras/musicplayer/musicplayer.pro index 73968cf..ae8f4eb 100644 --- a/examples/winextras/musicplayer/musicplayer.pro +++ b/examples/winextras/musicplayer/musicplayer.pro @@ -12,10 +12,7 @@ SOURCES = \ musicplayer.cpp \ volumebutton.cpp -RESOURCES += \ - musicplayer.qrc - -RC_ICONS = images/musicplayer.ico +RC_ICONS = images/qt-logo.ico target.path = $$[QT_INSTALL_EXAMPLES]/winextras/musicplayer INSTALLS += target diff --git a/examples/winextras/musicplayer/musicplayer.qrc b/examples/winextras/musicplayer/musicplayer.qrc deleted file mode 100644 index b1a0029..0000000 --- a/examples/winextras/musicplayer/musicplayer.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file alias="musicplayer.png">images/musicplayer.png</file> -</qresource> -</RCC> diff --git a/examples/winextras/musicplayer/musicplayer.rc b/examples/winextras/musicplayer/musicplayer.rc deleted file mode 100644 index 00a51ee..0000000 --- a/examples/winextras/musicplayer/musicplayer.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "images\\musicplayer.ico" diff --git a/examples/winextras/quickplayer/images/qt-logo.ico b/examples/winextras/quickplayer/images/qt-logo.ico Binary files differnew file mode 100644 index 0000000..b5ac59b --- /dev/null +++ b/examples/winextras/quickplayer/images/qt-logo.ico diff --git a/examples/winextras/quickplayer/images/quickplayer.ico b/examples/winextras/quickplayer/images/quickplayer.ico Binary files differdeleted file mode 100644 index fef1dee..0000000 --- a/examples/winextras/quickplayer/images/quickplayer.ico +++ /dev/null diff --git a/examples/winextras/quickplayer/images/quickplayer.png b/examples/winextras/quickplayer/images/quickplayer.png Binary files differdeleted file mode 100644 index ecbff0c..0000000 --- a/examples/winextras/quickplayer/images/quickplayer.png +++ /dev/null diff --git a/examples/winextras/quickplayer/quickplayer.pro b/examples/winextras/quickplayer/quickplayer.pro index f7474f7..77f9c97 100644 --- a/examples/winextras/quickplayer/quickplayer.pro +++ b/examples/winextras/quickplayer/quickplayer.pro @@ -12,7 +12,7 @@ OTHER_FILES += \ RESOURCES += \ quickplayer.qrc -RC_ICONS = images/quickplayer.ico +RC_ICONS = images/qt-logo.ico target.path = $$[QT_INSTALL_EXAMPLES]/winextras/quickplayer INSTALLS += target diff --git a/examples/winextras/quickplayer/quickplayer.qrc b/examples/winextras/quickplayer/quickplayer.qrc index 7515bd2..e046252 100644 --- a/examples/winextras/quickplayer/quickplayer.qrc +++ b/examples/winextras/quickplayer/quickplayer.qrc @@ -8,6 +8,5 @@ <file alias="backward-32.png">images/media-seek-backward-32.png</file> <file alias="forward-32.png">images/media-seek-forward-32.png</file> <file alias="stop-32.png">images/media-stop-32.png</file> - <file alias="quickplayer.png">images/quickplayer.png</file> </qresource> </RCC> diff --git a/src/imports/winextras/qquickjumplist.cpp b/src/imports/winextras/qquickjumplist.cpp index 2126e0c..0f210c7 100644 --- a/src/imports/winextras/qquickjumplist.cpp +++ b/src/imports/winextras/qquickjumplist.cpp @@ -170,8 +170,8 @@ void QQuickJumpList::rebuild() jumpList.frequent()->setVisible(m_frequent && m_frequent->isVisible()); if (m_tasks && m_tasks->isVisible()) { jumpList.tasks()->setVisible(true); - const QList<QWinJumpListItem *> &itemList = m_tasks->toItemList(); - for (QWinJumpListItem *item : itemList) + const auto items = m_tasks->toItemList(); + for (QWinJumpListItem *item : items) jumpList.tasks()->addItem(item); } for (QQuickJumpListCategory *category : qAsConst(m_categories)) { diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp index a69534f..052a4e6 100644 --- a/src/imports/winextras/qquickjumplistcategory.cpp +++ b/src/imports/winextras/qquickjumplistcategory.cpp @@ -127,7 +127,7 @@ void QQuickJumpListCategory::setVisible(bool visible) QList<QWinJumpListItem *> QQuickJumpListCategory::toItemList() const { QList<QWinJumpListItem *> items; - foreach (QQuickJumpListItem *item, m_items) + for (QQuickJumpListItem *item : m_items) items.append(item->toJumpListItem()); return items; } diff --git a/src/imports/winextras/qquickthumbnailtoolbar.cpp b/src/imports/winextras/qquickthumbnailtoolbar.cpp index ef7e079..00eb1b5 100644 --- a/src/imports/winextras/qquickthumbnailtoolbar.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbar.cpp @@ -115,7 +115,7 @@ void QQuickThumbnailToolBar::removeButton(QQuickThumbnailToolButton *button) void QQuickThumbnailToolBar::clear() { m_toolbar.clear(); - foreach (QQuickThumbnailToolButton *button, m_buttons) + for (QQuickThumbnailToolButton *button : qAsConst(m_buttons)) button->deleteLater(); m_buttons.clear(); emit countChanged(); diff --git a/src/imports/winextras/winextras.pro b/src/imports/winextras/winextras.pro index 019c7de..0d6ec55 100644 --- a/src/imports/winextras/winextras.pro +++ b/src/imports/winextras/winextras.pro @@ -5,6 +5,8 @@ IMPORT_VERSION = 1.0 QT += qml quick winextras winextras-private +DEFINES += QT_NO_FOREACH + QML_FILES += \ JumpListLink.qml \ JumpListDestination.qml \ diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp index 3f6f013..6b31e71 100644 --- a/src/winextras/qwineventfilter.cpp +++ b/src/winextras/qwineventfilter.cpp @@ -113,7 +113,8 @@ void QWinEventFilter::setup() QWindow *QWinEventFilter::findWindow(HWND handle) { const WId wid = reinterpret_cast<WId>(handle); - foreach (QWindow *topLevel, QGuiApplication::topLevelWindows()) { + const auto topLevels = QGuiApplication::topLevelWindows(); + for (QWindow *topLevel : topLevels) { if (topLevel->handle() && topLevel->winId() == wid) return topLevel; } diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp index 9134e73..a277a74 100644 --- a/src/winextras/qwinjumplist.cpp +++ b/src/winextras/qwinjumplist.cpp @@ -143,7 +143,7 @@ void QWinJumpListPrivate::_q_rebuild() appendKnownCategory(KDC_RECENT); if (frequent && frequent->isVisible()) appendKnownCategory(KDC_FREQUENT); - foreach (QWinJumpListCategory *category, categories) { + for (QWinJumpListCategory *category : qAsConst(categories)) { if (category->isVisible()) appendCustomCategory(category); } @@ -267,7 +267,7 @@ IObjectCollection *QWinJumpListPrivate::toComCollection(const QList<QWinJumpList QWinJumpListPrivate::warning("QWinJumpList: failed to instantiate IObjectCollection", hresult); return 0; } - Q_FOREACH (QWinJumpListItem *item, list) { + for (QWinJumpListItem *item : list) { IUnknown *iitem = toICustomDestinationListItem(item); if (iitem) { collection->AddObject(iitem); @@ -557,7 +557,7 @@ void QWinJumpList::addCategory(QWinJumpListCategory *category) QWinJumpListCategory *QWinJumpList::addCategory(const QString &title, const QList<QWinJumpListItem *> items) { QWinJumpListCategory *category = new QWinJumpListCategory(title); - foreach (QWinJumpListItem *item, items) + for (QWinJumpListItem *item : items) category->addItem(item); addCategory(category); return category; @@ -575,7 +575,7 @@ void QWinJumpList::clear() frequent()->clear(); if (d->tasks) d->tasks->clear(); - foreach (QWinJumpListCategory *category, d->categories) + for (QWinJumpListCategory *category : qAsConst(d->categories)) category->clear(); d->destroy(); } diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index 58978f9..d7e4ced 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -199,7 +199,7 @@ void QWinThumbnailToolBar::setButtons(const QList<QWinThumbnailToolButton *> &bu { Q_D(QWinThumbnailToolBar); d->buttonList.clear(); - Q_FOREACH (QWinThumbnailToolButton *button, buttons) + for (QWinThumbnailToolButton *button : buttons) addButton(button); d->_q_updateToolbar(); } diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro index a899f6c..5d93c6b 100644 --- a/src/winextras/winextras.pro +++ b/src/winextras/winextras.pro @@ -2,6 +2,8 @@ TARGET = QtWinExtras QT += gui-private core-private +DEFINES += QT_NO_FOREACH + SOURCES += \ qwinfunctions.cpp \ qwinfunctions_p.cpp \ diff --git a/sync.profile b/sync.profile index ea800ca..4a980a7 100644 --- a/sync.profile +++ b/sync.profile @@ -1,9 +1,3 @@ %modules = ( "QtWinExtras" => "$basedir/src/winextras", ); - -%dependencies = ( - "qtbase" => "", - "qtdeclarative" => "", - "qtxmlpatterns" => "", -); |