aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix jumplist example documentation snippetFriedemann Kleint2018-11-131-7/+4
| | | | | | | | | Update API. Fixes: QTBUG-71709 Change-Id: I21d5a78a0a9c124308b2341a61cb1e12bf689a4a Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Doc: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-072-2/+2
| | | | | | | | | | The use of QT_INSTALL_HEADERS caused documentation build failures in certain configurations. Use an alternative method to pass the required include paths to QDoc. Task-number: QTBUG-67925 Change-Id: Iaad02ec87ec08babb04a1fffe034bf42d32c1d58 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Fix MinGW compiler warningsFriedemann Kleint2018-11-071-2/+2
| | | | | | | | | | | | | | Change internal functions to be inline, fixing: qwinfunctions_p.h:75:17: warning: 'void QtDwmApiDll::setBooleanWindowAttribute(HWND, DWORD, bool)' defined but not used [-Wunused-function] static void setBooleanWindowAttribute(HWND hwnd, DWORD attribute, bool value) qwinfunctions_p.h:72:17: warning: 'bool QtDwmApiDll::booleanWindowAttribute(HWND, DWORD)' defined but not used [-Wunused-function] static bool booleanWindowAttribute(HWND hwnd, DWORD attribute) Change-Id: If61d35df92aa449c394f80b7a8ff722a10aa1fe8 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix some clang-tidy warningsFriedemann Kleint2018-07-256-29/+15
| | | | | | | | | | | - Fix 'if (foo) delete foo' to 'delete foo' - Use ' = default' for trivial constructors/destructors - Use range based for where possible - Fix invocations of static methods - Replace some reinterpret_cast by static_cast Change-Id: I998572f370f3e8a1fc39e6c763e941d5a2f598b0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-1/+1
|\ | | | | | | Change-Id: I41c0c4a1c401f7a11dfb092177e0e633f838dd69
| * Doc: Add missing dots (qtwinextras)Paul Wicking2018-06-191-1/+1
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I9d12df49ffea1b96981021a00834eaba0e527983 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* | Fix Qt include statementsFriedemann Kleint2018-05-2216-52/+51
| | | | | | | | | | | | | | | | | | | | | | Change #include <QtCore/QDebug>, #include <QDebug> to #include <QtCore/qdebug.h> according to the coding style. Change-Id: I45fa5e55222e6913972d743908c47480b23cd92c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I9c47e29e336efac47e41a583bb1ba4368f3170fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Add imageToHBITMAP(), imageFromHBITMAP()Friedemann Kleint2018-04-182-0/+33
|/ | | | | | | | | | | | | Add new functions for image conversions wrapping their QtGui equivalents. [ChangeLog][QtWin] Added functions imageToHBITMAP() and imageFromHBITMAP() for conversion between QImage and HBITMAP, preserving the format where possible. Task-number: QTBUG-51124 Change-Id: I212b2dff182dce3a9b08753b6435d01b75bb5434 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Doc: Clear rest of the documentation warningsv5.11.0-beta4Topi Reinio2018-04-122-1/+5
| | | | | | | | | Declare more windows-specific types for QDoc (Clang), and add Qt include path for the documentation build. This resolves the remaining documentation warnings. Change-Id: Ibdf23826a5e751b32ba21e762e7316d020a5e2dc Reviewed-by: Martin Smith <martin.smith@qt.io>
* Doc: Fix documentation warnings related to Clang-enabled QDocTopi Reinio2018-04-114-0/+33
| | | | | | | | | | | | | Since Qt 5.11, QDoc uses Clang to parse C++ documentation. On platforms where Qt Windows Extras does not build, we still need to be able to build the documentation. To enable this, create a custom module header and include paths for Clang-QDoc, used only in documentation builds, and add dummy typedefs for Windows-specific types for Clang to see. Change-Id: I641570c80b6cc948c92c404d8d90ad1a3045925c Reviewed-by: Martin Smith <martin.smith@qt.io>
* Raise minimum supported MSVC version to 2015Friedemann Kleint2018-01-052-6/+1
| | | | | | | | Remove code for older versions and streamline #ifdefs. Task-number: QTBUG-51673 Change-Id: Id16d53d4342691e1e01913c2aec3a252dddbdadb Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Port away from QRegion::rects()Marc Mutz2017-12-041-6/+6
| | | | | | | Use begin()/end() instead. Change-Id: I626d803be52087c3f3afd287cce121040222d90c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2011-21/+81
|\ | | | | | | Change-Id: I74a06808463f12488fe19b3e9ec7d1c20ac529b4
| * Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3011-21/+81
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5a19f702cce4bd518f873140c4cbe0c7e53d6bce
| | * Fix outdated BSD license headerKai Koehne2017-09-296-6/+66
| | | | | | | | | | | | | | | Change-Id: I93fe6c2f2008867eab0127bd0eb1b4e9fc968fdd Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * Fix outdated FDL license headerKai Koehne2017-09-295-15/+15
| | | | | | | | | | | | | | | Change-Id: Ic862ca99a27ff61d2654001ff4d9c17eceade472 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Directly link to functions available from Windows 7 onwardsFriedemann Kleint2017-09-285-125/+22
| | | | | | | | | | | | | | | | | | Change-Id: I8033100c34c703e6119e4b1f322b795b0cc1ff4a Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-267-7/+7
|/ / | | | | | | | | Change-Id: Ia07741ad7ee5174c03b12d6880e00d279a6d4eae Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-151-1/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I26b1b6de8dc0798d707cb8adce8530238a4d1d98
| * QWinJumpList: Fix typo in macro checkFriedemann Kleint2017-07-031-1/+1
| | | | | | | | | | | | Task-number: QTBUG-61740 Change-Id: Iffc1f1d95d7562c20c272495aa2ba92e4ac7aa0e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/devLiang Qi2017-06-072-2/+3
|\|
| * Migrate to QRegularExpressionv5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Samuel Gaist2017-03-131-1/+2
| | | | | | | | | | | | | | | | This patch updates the code base to use QRegularExpression in the place of the deprecated QRegExp class. Change-Id: I884282c3ee59db8742b7883a7815a55b529029a0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-1/+1
| |\ | | | | | | | | | Change-Id: Ie39cbcc4e877ac0ad1ae1ee2acbf3f58a2905299
| | * Fix build of the QML import with -no-openglFriedemann Kleint2017-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add -luser32 in that case. Task-number: QTBUG-58415 Change-Id: I052dac8b44409f60b461e93f463d0e4854718a57 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | QWinTaskBarButton: Fix evaluation of progress bar for large valuesPavel Geiger2017-06-071-1/+1
|/ / | | | | | | | | | | | | Change order of evaluation so the division is done first Change-Id: I1ce5ae28e1dafa065bf6b6854477cef9ec5b5b25 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-258-10/+15
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/winextras/qquickjumplist.cpp Change-Id: I2272b873c872bbabf7e274a478e3d16b92cdb434
| * 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>
* | Remove foreach from tests and examplesFriedemann Kleint2016-12-221-2/+3
| | | | | | | | | | | | | | | | Replace by range based for loops. Amends change 13604e3fcc12a536d228f415ce65ca1c86b7015b. Change-Id: Ie0712c6fd1743bc7ca8345de58b49a08e1f69653 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Use member initializationFriedemann Kleint2016-12-017-45/+23
|/ | | | | | | Use initialization in structs and remove unneeded constructors. Change-Id: Ieb0efbf6fe12bdbe871fff95fae289e7be9c8c0c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@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-192-2/+2
| | | | | | Change-Id: Ia72129947858da59a05a7114a5b35514e443909f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* 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>