Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-02-13 | 10 | -13/+11 |
|\ | |||||
| * | Regenerate projects one last time before mergewip/cmake | Alexandru Croitor | 2020-02-12 | 10 | -13/+11 |
* | | Merge remote-tracking branch 'origin/5.15' into dev | Liang Qi | 2020-02-13 | 5 | -15/+82 |
|\ \ | |/ |/| | |||||
| * | Detect double timer during single timeout in registerTimer test, and skip | Volker Hilsheimer | 2020-02-12 | 1 | -5/+17 |
| * | QTranslator: Expose language of translation file | Kai Koehne | 2020-02-10 | 2 | -2/+7 |
| * | QTranslator: Expose origin file of the translation | Kai Koehne | 2020-02-10 | 1 | -1/+5 |
| * | Discover the conditions under which registerTimer is flaky, and skip | Volker Hilsheimer | 2020-02-07 | 1 | -0/+22 |
| * | QSignalMapper: deprecate overridden signals | Vitaly Fanaskov | 2020-02-01 | 1 | -7/+7 |
| * | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-01-29 | 1 | -0/+24 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/5.14.1' into 5.14 | Liang Qi | 2020-01-28 | 1 | -0/+24 |
| | |\ | |||||
| | | * | Merge 5.14 into 5.14.1 | Kari Oikarinen | 2020-01-15 | 1 | -4/+4 |
| | | |\ | |||||
| | | * | | QSequentialIterableImpl: support append | Fabian Kosmale | 2020-01-15 | 1 | -0/+24 |
* | | | | | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-02-03 | 30 | -0/+632 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2020-01-29 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/dev' into merge-dev | Leander Beernaert | 2020-01-24 | 7 | -486/+252 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Regenerate Tests | Leander Beernaert | 2020-01-16 | 1 | -1/+1 |
| * | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Leander Beernaert | 2019-11-19 | 3 | -18/+22 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Regenerate tests/auto/corelib/kernel | Alexandru Croitor | 2019-11-12 | 25 | -83/+113 |
| * | | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-10-14 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-10-11 | 6 | -70/+34 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Regenerate tests that use helper processes | Alexandru Croitor | 2019-08-23 | 3 | -9/+6 |
| * | | | | | | | | | | Merge branch 'wip/qt6' into wip/cmake | Alexandru Croitor | 2019-08-15 | 12 | -31/+27 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix add_qt_resource behavior with regards to unspecified prefixes | Simon Hausmann | 2019-08-09 | 1 | -3/+8 |
| * | | | | | | | | | | | Regenerate tests/auto/corelib/kernel.pro | Alexandru Croitor | 2019-08-01 | 2 | -11/+51 |
| * | | | | | | | | | | | Regenerate qsocketnotifier test | Alexandru Croitor | 2019-08-01 | 2 | -9/+36 |
| * | | | | | | | | | | | Properly convert default QT directive | Jędrzej Nowacki | 2019-08-01 | 2 | -1/+3 |
| * | | | | | | | | | | | Implement SUBDIR-= conversion in pro2cmake tool | Jędrzej Nowacki | 2019-08-01 | 27 | -17/+527 |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-07-11 | 10 | -25/+67 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-06-14 | 3 | -60/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-06-03 | 6 | -253/+357 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'dev' into 'wip/cmake-merge' | Tobias Hunger | 2019-04-16 | 12 | -139/+693 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Begin port of qtbase to CMake | Simon Hausmann | 2018-11-01 | 13 | -0/+25 |
* | | | | | | | | | | | | | | | | Adjust QVariant autotest to prepare for upcoming QHash changes | Lars Knoll | 2020-01-30 | 1 | -24/+4 |
| |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Simon Hausmann | 2020-01-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-01-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Flatten version-specific blacklisting on macOS to all macOS versions | Tor Arne Vestbø | 2020-01-22 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-13 | 1 | -4/+4 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Liang Qi | 2020-01-09 | 1 | -4/+4 |
| |\| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | QObject: Replace more 0 and NULL with nullptr | Andre Hartmann | 2020-01-09 | 1 | -4/+4 |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Friedemann Kleint | 2020-01-07 | 1 | -0/+44 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-01-06 | 1 | -0/+44 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | QVariant: Prefer direct conversion to QVariant{List,Map,Hash} | Fabian Kosmale | 2020-01-03 | 1 | -0/+44 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Liang Qi | 2020-01-04 | 1 | -1/+96 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2019-12-12 | 1 | -1/+96 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | QVariant: introduce ShouldDeleteVariantData flag | Fabian Kosmale | 2019-12-11 | 1 | -1/+96 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-12-11 | 4 | -7/+52 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15" | Liang Qi | 2019-12-10 | 3 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Liang Qi | 2019-12-10 | 3 | -7/+7 |
| | |\| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Don't wrap feature detection macros with QT_HAS_FOO() variants | Tor Arne Vestbø | 2019-12-10 | 3 | -7/+7 |
| * | | | | | | | | | | | | QCocoaEventDispatcher: make 'interrupt' work | Timur Pocheptsov | 2019-12-10 | 1 | -0/+45 |
| |/ / / / / / / / / / / |