aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-243-1/+1
|\ | | | | | | Change-Id: Ia50eff53661f7d699f7f2bc3710cc6643b9f434f
| * Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-193-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I80957f4153719692cf2deede03ad09634c702fea
| | * 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>
| | * 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>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-0811-9/+18
|\| | | | | | | | | | | Change-Id: Ica398d5ef95c836e8c8ac5bc6141720798305fc7
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-088-7/+7
| |\| | | | | | | | | | Change-Id: I0ce2094980fbd70c017fea7748cbc5c224d974cc
| | * 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-221-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>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-2/+2
| |\| | | | | | | | | | Change-Id: Idd177eb0d33d08a1556858c8dc594c6ac38cbc18
| | * 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-155-1197/+1202
|\| | | | | | | | | | | | | 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>
| * 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-1957-832/+1174
|/ | | | | | | | | | 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>
* 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>
* Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-0519-0/+209
| | | | | Change-Id: I27447f8bf4a3243e517d1f2c7ad7b07d00d2e83f Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Update plugins.qmltypesKai Koehne2015-09-171-2/+157
| | | | | | Change-Id: I8f8e221b6c9d9e06a7b18bfcc979a9b9e27e2077 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Improve documentation of QWinTaskbarButton::setWindow().Friedemann Kleint2015-07-082-1/+5
| | | | | | | | | Mention that QWidget::windowHandle() may return 0 until the widget is shown. Task-number: QTBUG-47035 Change-Id: Ied8ceb6c1652f5f416a51dc6378599d5efe85420 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-151-2/+6
|\ | | | | | | Change-Id: Ic1f50d8d646e53f6a5629db98fcaa7a1a99d8b4f
| * QWinTaskBarButton: Document Windows 7 dependencyKai Koehne2015-04-091-1/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-36664 Change-Id: Ied9bf21aa5b1ceacb2fad37ab9c96869570964ca GPush-Base: accd3c875a4c25fa59b861442f7302fbf8079666 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * QWinTaskBarButton: Do not crash on exit (XP)Kai Koehne2015-04-081-1/+2
| | | | | | | | | | | | | | Task-number: QTBUG-36664 Change-Id: Ie6cedd6b62042b96f4c2fa1f924a775e5e53e418 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Port to new Q_ENUM macro.Friedemann Kleint2015-04-021-1/+2
| | | | | | | | | | Change-Id: I0b6d44dfed0a7b71f84dc175fd3c82831cc7fc90 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update copyright headersv5.5.0-alpha1Antti Kokko2015-02-1668-425/+425
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ia5781193927251d6b6786f53a9b1cfba9e6d0782 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Refactor QWinEventFilter.Friedemann Kleint2015-02-061-9/+6
| | | | | | | | | | | | | | | | | | - Fix invocation of static methods. - Prevent it from enforcing native windows in findWindow(). Change-Id: I08d88f7753968459b8f77e24bd188cbbf982c21b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-022-3/+8
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0e3a17d947087a01ea98826c73ad190165751c04
| * Update plugins.qmltypesKai Koehne2014-12-051-2/+7
| | | | | | | | | | Change-Id: If4fa3c8d3fcc150535e9d513f87e0bee2a2ad9d1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Add missing new keyword to code snippetAndy Shaw2014-11-101-1/+1
| | | | | | | | | | Change-Id: I12ca827ec2663aec95fe872125c2719cb76fe9e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Use Qt 5 signals & slot syntax.Friedemann Kleint2014-12-174-14/+13
|/ | | | | Change-Id: I548076eebc2c8f1204ef76bb4e6e09ed00352553 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove setting of the default identifier from QWinJumpList.v5.4.0-rc1v5.4.0-beta1Friedemann Kleint2014-10-022-22/+8
| | | | | | | | | QWinJumpList does not work with a default-generated ID, this is only useful when the ID is properly registered. Task-number: QTBUG-41155 Change-Id: Ic0e0238fa3337d79ac7bc3d1efb314e1533355f2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix for QWinThumbnailToolBar GDI leakxcdix2014-09-292-10/+11
| | | | | | | QTBUG-41635 Change-Id: I60e34c8f32df6fc7ff9eac2812f71d611b903f41 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix errorMessageFromComError().v5.4.0-alpha1Friedemann Kleint2014-09-041-1/+1
| | | | | | Task-number: QTBUG-41138 Change-Id: I86738bb2bdd1fb3064a7894922869bca2a1b4581 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* HICON should be destroyed by DestroyIconSergey Radionov2014-08-281-1/+1
| | | | | | | | fix GDI object leaks at least on Win 8.1 x64 Task-number: QTBUG-40996 Change-Id: I9314486ab498a3f74c22deb6ca874ea6adc2e36c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Update license headers and add new license filesAntti Kokko2014-08-2457-1055/+599
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I4852e1e3fb306319e63d919675acad9a64e43db6 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Disable build for WinRT on top-levelMaurice Kalinowski2014-07-071-1/+1
| | | | | | | otherwise build system tries to compile examples without the module Change-Id: I34fc2abafd716066bb1801f7faee893c2dd43bce Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: Ide89c13df5ddcac1c19ce833d4aaa16f5dec3b67 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Implement iconic live previews/iconic thumbnail icons.Friedemann Kleint2014-07-078-12/+437
| | | | | | | | | | | [ChangeLog][QWinThumbnailToolBar] Added pixmap properties and change notifications for thumbnail icons and live preview. Task-number: QTBUG-36730 Change-Id: I31ad0ff347235bc7933c1c14dece359ec0c36b39 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Refactor QQuickIconLoader.Friedemann Kleint2014-07-026-108/+178
| | | | | | | | | | | | Instead using a QObject with a single icon member variable that needs to be instantiated for each task bar button, introduce a static load function that takes a member function pointer accepting a QVariant. For synchronous requests, invoke it immediately; connect it to a slot for network requests. Task-number: QTBUG-36730 Change-Id: Ic70422d98d0bc3d486b32fb3534400b9fff8d324 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add QWinMime.Friedemann Kleint2014-06-163-2/+274
| | | | | | | | | | | | Add class QWinMime (equivalent to WindowsMime in Qt 4). [ChangeLog][QWinMime] Added abstract class QWinMime (equivalent to WindowsMime in Qt 4) for registering custom mime type conversions. Task-number: QTBUG-39559 Change-Id: Ie8ff4db6cd0ce64f65b83232dc91d771238663d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-141-6/+20
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I24d21a3aabd24dea0540b3abe56f386bdfacb3ee
| * Remove dependency on swprintf_s() pulled in via _com_error::ErrorMessage().Friedemann Kleint2014-05-191-6/+20
| | | | | | | | | | | | Task-number: QTBUG-35617 Change-Id: I5078e3cb3841baa836934be60cce27b2e47d9a7e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | A recent change (46959875) in qdoc raised QML types from subnodes to top-level nodes. This change modifies the documentation configuration file(s) accordingly. Change-Id: Iaf760016f9be53d8e926fca2ce50734b5af83d6f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Introduce structs for dynamically resolved functions per DLL.Friedemann Kleint2014-05-284-166/+152
| | | | | | | | | | | | | | | | | | Preparing the adding of the iconic preview functions; the current approach of having one qt_ .. function does not scale well. Task-number: QTBUG-36730 Change-Id: Id70b9b13b8cd09d4d9c2830e9d6d0a413fd812a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Fix build with dynamic GL.Friedemann Kleint2014-05-282-1/+3
|/ | | | | Change-Id: I9dafdea8745e680a20c162496f3b5089b38037de Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.3.0-alpha1Frederik Gladhorn2014-02-121-0/+1
|\ | | | | | | Change-Id: I77b03ce6926549bb5603364f64fd4eb07f8906bf
| * Fix linking problem when built with -no-openglold/5.2Andy Shaw2014-02-111-0/+1
| | | | | | | | | | | | | | | | | | When -no-opengl was used then it was not automatically pulling in the needed Windows libraries as it was not loading opengl.prf to get them from. Change-Id: Ic00717b2327a1f7cf05f55bcde7a7308e36c19e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 20:11:39 +0000