diff options
-rw-r--r-- | dist/changes-5.6.2 | 24 | ||||
-rw-r--r-- | dist/changes-5.7.1 | 24 | ||||
-rw-r--r-- | examples/winextras/musicplayer/images/musicplayer.ico | bin | 31371 -> 0 bytes | |||
-rw-r--r-- | examples/winextras/musicplayer/images/musicplayer.png | bin | 9186 -> 0 bytes | |||
-rw-r--r-- | examples/winextras/musicplayer/images/qt-logo.ico | bin | 0 -> 96079 bytes | |||
-rw-r--r-- | examples/winextras/musicplayer/main.cpp | 1 | ||||
-rw-r--r-- | examples/winextras/musicplayer/musicplayer.pro | 5 | ||||
-rw-r--r-- | examples/winextras/musicplayer/musicplayer.qrc | 5 | ||||
-rw-r--r-- | examples/winextras/musicplayer/musicplayer.rc | 1 | ||||
-rw-r--r-- | examples/winextras/quickplayer/images/qt-logo.ico | bin | 0 -> 96079 bytes | |||
-rw-r--r-- | examples/winextras/quickplayer/images/quickplayer.ico | bin | 31371 -> 0 bytes | |||
-rw-r--r-- | examples/winextras/quickplayer/images/quickplayer.png | bin | 9186 -> 0 bytes | |||
-rw-r--r-- | examples/winextras/quickplayer/quickplayer.pro | 2 | ||||
-rw-r--r-- | examples/winextras/quickplayer/quickplayer.qrc | 1 | ||||
-rw-r--r-- | sync.profile | 6 |
15 files changed, 50 insertions, 19 deletions
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 0502015..b5c4141 100644 --- a/examples/winextras/musicplayer/main.cpp +++ b/examples/winextras/musicplayer/main.cpp @@ -95,7 +95,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/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" => "", -); |