aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Eradicate Q_FOREACH loops and mark the libraries as Q_FOREACH-freev5.8.0-beta1Marc Mutz2016-09-058-10/+16
| | | | | Change-Id: I4dbad7ab4c9f467b2e2fd90eff44e1c4a58d43e2 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Improve robustness of QML plugin loadingv5.8.0-alpha1Simon Hausmann2016-08-261-1/+1
| | | | | | | | Use a variable that expands to the latest plugin version instead of hard-coding the string. Change-Id: Ica08496d3a9a357db32d0cd1e0abc8503c575c2e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Adjust to qtConfig() changes in qtbaseLars Knoll2016-08-193-3/+3
| | | | | | Change-Id: Ia72129947858da59a05a7114a5b35514e443909f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-027-52/+255
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id7890339704dcb0670fd67e66973cea0b643cab1
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-016-50/+237
| |\ | | | | | | | | | Change-Id: I85afc39028bdbdca089efca59290f231bc413e7c
| | * Polish and extend the image extractor exampleFriedemann Kleint2016-07-142-46/+233
| | | | | | | | | | | | | | | | | | | | | | | | - Use QCommandLineParser. - Add an option to extract shell icons via SHGetFileInfo(). Change-Id: I9d1040a7311c205b9c16e4e406996278a53e5f53 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-174-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I2ac64535c87bb511ee9bbb09320d4640a7a79f25 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I0c14fa24f819a00fb4ea72eec6a35774e7d7b051
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-2/+18
| |\ \ | | | | | | | | | | | | Change-Id: I437556c11665dd736cfe81857e79671417222e3d
| | * | Mention license change in 5.7.0 changelog.v5.7.0Friedemann Kleint2016-06-081-2/+18
| |/ / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53913 Change-Id: I573f5efb7864ecb23e3c727c6c795c9651b71b83 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Polish the player example.Friedemann Kleint2016-05-315-73/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Port it to use URLs and mime types. - Introduce QCommandLineParser. - Resize according to screen size. - Add some bells and whistles, set window file paths, always display duration and file name, handle drop. Change-Id: I75aa101d32cfde0c0c75a0686a50c2d7d5dce827 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Increase API level to 0x600 (Windows Vista).Friedemann Kleint2016-05-256-150/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directly link against dwmapi which should be present on Windows Vista and remove duplicated header constants. Only the functions for iconic live preview which are present on Windows 7 onwards are still dynamically resolved. Similarly, shell32 can now be directly linked, leaving SetCurrentProcessExplicitAppUserModelID() present on Windows 7 onwards. Task-number: QTBUG-51673 Change-Id: I54b6827d4582318542729fa43f73f2c4e41ec71f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-246-1/+50
|\| | | | | | | | | | | Change-Id: Ia50eff53661f7d699f7f2bc3710cc6643b9f434f
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-195-1/+28
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I80957f4153719692cf2deede03ad09634c702fea
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: I457fa602921df64c0c2c232d0c429330ceaacf69
| | * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.1Topi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Ia9f4392083975236936aef867650c9f95855909f Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| | * Add changelog for Qt 5.6.1 releaseFriedemann Kleint2016-05-121-0/+24
| | | | | | | | | | | | | | | Change-Id: Id86e09eeb4f5334e2e40c2f8afe3a120d02422c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * add missing example installOswald Buddenhagen2016-05-101-0/+3
| | | | | | | | | | | | | | | Change-Id: I9513901d7b57ca396501cda4c8ac77ab682fc768 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * WinExtras/doc/: Fix PNG format errors in two images.Edward Welbourne2016-04-112-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The identify command reported CRC errors in these two images. Fixed using $ optipng -o7 -strip all -fix $f $ pngcrush -ow -brute -force -rem allb -reduce $f with each as $f and then checked visually to appear unchanged. Change-Id: I5da5fe03bbbc48b8b19c95e91d08dee1d4deeff9 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
| * | Add changelog for Qt 5.7.0 releaseFriedemann Kleint2016-04-261-0/+22
| | | | | | | | | | | | | | | Change-Id: If1b48dadab4ecb1dcbfb97130f419041f92135e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-0823-20/+31
|\| | | | | | | | | | | Change-Id: Ica398d5ef95c836e8c8ac5bc6141720798305fc7
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0818-7/+7
| |\| | | | | | | | | | Change-Id: I0ce2094980fbd70c017fea7748cbc5c224d974cc
| | * Purge sRGB chunks from PNGs in tests.Edward Welbourne2016-03-313-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: Iec1361cbf9cfbe6412e7934666c6868efda80eb1 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-227-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I2285bc99e10d123f15fb3b0aa08bd6de46ce652d Task-number: QTBUG-45291 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-223-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I590cccca47afccc883fe8fa347976133465c87f9 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-225-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I06f71d612c71cc14477f657cccf01b6e1c263f7f Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * | Skipping testRecent() and testFrequent() tests from Win8.1 onwardsMilla Pohjanheimo2016-04-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Interaction with Windows taskbar probably is unstable and it makes the tests fail randomly. Extending QSKIP to affect Win8.1 also. Change-Id: I757a01fb84fe0b585ef076c423c04962d2a91749 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-072-9/+11
| |\| | | | | | | | | | Change-Id: Idd177eb0d33d08a1556858c8dc594c6ac38cbc18
| | * tst_qpixmap: Fix warnings as shown by Qt Creator's Clang based code model.Friedemann Kleint2016-02-261-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove C-style casts and fix integer conversion issues. Task-number: QTBUG-50804 Task-number: QTBUG-51124 Change-Id: I6e30a7e62f3f8d389d0b3d1ba81dad2df8417d04 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I0b7d178c0430549b81367f7ab500ea804d44152e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Enable using the module in a statically built applicationv5.7.0-alpha1Andy Shaw2016-02-262-0/+9
| | | | | | | | | | | | | | | | | | Change-Id: I703af8402b38309562c2de9029070ac19a36c7f0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Use _com_error::ErrorMessage() directly.Friedemann Kleint2016-04-011-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the duplicated code that was used for Windows XP. Reverts commit f5aa8ff0c397014bd0445986c33cfb0d55f0d533. Task-number: QTBUG-51673 Task-number: QTBUG-35617 Change-Id: I269bd4708b7611a9f65097228bd1095963530404 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Define macro NTDDI_VERSION for MinGW locally in qwinjumplistcategory.cpp.Friedemann Kleint2016-04-012-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the project-wide definition in the .pro file which is no longer necessary after globally bumping WINVER to 0x600 and clean up obsolete macro definitions. Task-number: QTBUG-51673 Change-Id: Icb425e5a2a1e70ae63ed84f3f2d81c505cf88175 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I6b71e876924447e94c31f2ff6f94f4e49d615932
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-156-1197/+1224
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2b3428a182d8012eee19acbaa0666c184a26d8d0
| * Fix build with Clang.Friedemann Kleint2016-02-111-1179/+1179
| | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly cast enumeration values that do not fit into HRESULT (long), fixing errors: qwinfunctions.cpp(1434,10) : error: case value evaluates to 2150760505, which cannot be narrowed to type 'HRESULT' (aka 'long') [-Wc++11-narrowing] case 0x80320039 : return QStringLiteral("FWP_E_INVALID_CIPHER_TRANSFORM"); Task-number: QTBUG-50804 Change-Id: I4c3fb1f832b075693db51e19d4c4eabd47a03e5d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | Change-Id: I90d7b8a34812ee13164c554cd33984ae44ccce2f
| * Add changelog for Qt 5.6.0 releasev5.6.0-rc1v5.6.0Friedemann Kleint2016-01-291-0/+22
| | | | | | | | | | Change-Id: Ia3b8fcf23cb1684c8b1b1bd1f97215d92f9d5a16 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Fix some CLANG warnings.Friedemann Kleint2016-01-195-18/+23
| | | | | | | | | | | | | | Remove C-style casts and fix integer conversion issues. Change-Id: I26e969e9108eb6f68c029ad5c507b95d95cd4d26 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-191-16/+33
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I6e669657ee947c10c6cee70eeb50eaf78ba127c8 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-1960-832/+2352
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ie3a7eb2a349a0c80b8ae4ca5f4a32baf7a646fa1 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-1918-289/+908
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I10ac49da8041433a9505a48bf440bf001ed9563b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-0113-226/+475
|\| | | | | | | Change-Id: I669796853f67166a688c885e0db415a534d1bbb4
| * Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-beta1Liang Qi2015-10-281-0/+24
| |\ | | | | | | | | | Change-Id: I597b48ecb7ad1e9c676aa56a534dafdf3208d173
| | * Add changelog for Qt 5.5.1 releasev5.5.15.5Friedemann Kleint2015-09-091-0/+24
| | | | | | | | | | | | | | | Change-Id: I5abef0c378efd0266a9251f0af1cb57352fdd43d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Add debug operators for QWinJumpList/QWinJumpListCategory/QWinJumpListItem.Friedemann Kleint2015-10-226-1/+90
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-48751 Change-Id: I300c8cf5207f0636d8b8fc5922514d67634a1a58 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| * | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I653b608734e680932cd11a3631dbe1a184162bb3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * | Improve the manual test for QWinJumpList.Friedemann Kleint2015-10-194-224/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use a QMainWindow to be able to use shortcuts and status bar. - Add menu entries for launching the jumplistsview tool and explorer. - Reformat/streamline code. - Add support for more mime types. - Use QCommandLineParser Task-number: QTBUG-48751 Change-Id: I7242c528069f1838bd6af1f9bc426193f0fc7dec Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| * | QWinJumpList: Skip failing tests on Windows 10.Friedemann Kleint2015-10-151-0/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-48751 Change-Id: If1a16a251d165447b3d9dba3a15d0c58d7ca0969 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1422-2/+1054
|\| | | | | | | | | | | Change-Id: Ie1b45051dbf18ec45865fd7a6228cce840f776ba