Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" | Alexandru Croitor | 2020-02-11 | 2 | -16/+6 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-02-10 | 2 | -16/+6 |
| |\ | |||||
| | * | Regenerate projects to correctly handle private dependencies | Alexandru Croitor | 2020-02-05 | 2 | -16/+6 |
* | | | Fix compilation with -no-directwrite | Eskil Abrahamsen Blomfeldt | 2020-02-10 | 2 | -5/+15 |
|/ / | |||||
* | | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" | Alexandru Croitor | 2020-02-07 | 3 | -0/+263 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2020-01-29 | 1 | -4/+5 |
| |\ | |||||
| * | | Post Merge Fixes | Leander Beernaert | 2020-01-24 | 2 | -2/+2 |
| * | | Merge remote-tracking branch 'origin/dev' into merge-dev | Leander Beernaert | 2020-01-24 | 9 | -120/+109 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/dev' into wip/cmake | Leander Beernaert | 2019-11-19 | 3 | -34/+77 |
| |\ \ \ | |||||
| * | | | | Regenerate src/* | Alexandru Croitor | 2019-11-14 | 2 | -30/+30 |
| * | | | | Regenerate everything under ./src | Alexandru Croitor | 2019-11-12 | 2 | -2/+0 |
| * | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Simon Hausmann | 2019-10-17 | 5 | -124/+122 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-10-14 | 3 | -141/+158 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-10-11 | 2 | -53/+8 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Regenerate platformsupport projects | Alexandru Croitor | 2019-10-08 | 2 | -3/+2 |
| * | | | | | | | Use pre-compiled headers when building Qt with cmake | Mårten Nordheim | 2019-09-11 | 1 | -1/+2 |
| * | | | | | | | Merge branch 'wip/qt6' into wip/cmake | Alexandru Croitor | 2019-08-15 | 7 | -71/+67 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-07-11 | 4 | -30/+58 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add support for private module .pri files | Simon Hausmann | 2019-06-05 | 2 | -0/+2 |
| * | | | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-06-03 | 9 | -21/+199 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix freetype target not being found when using vcpkg | Alexandru Croitor | 2019-05-08 | 1 | -2/+2 |
| * | | | | | | | | | | CMake: Regenerate platformsupport/fontdatabases | Tobias Hunger | 2019-05-06 | 1 | -16/+24 |
| * | | | | | | | | | | Write find_dependency() calls in Qt Module config files | Alexandru Croitor | 2019-05-02 | 1 | -2/+2 |
| * | | | | | | | | | | Merge commit 'dev' into 'wip/cmake-merge' | Tobias Hunger | 2019-04-16 | 17 | -649/+450 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix simplification of conditions involving apple | Alexandru Croitor | 2019-04-02 | 1 | -1/+5 |
| * | | | | | | | | | | | CMake: Re-generate platformsupport/fontdatabases | Tobias Hunger | 2019-03-29 | 1 | -14/+21 |
| * | | | | | | | | | | | Fix Windows build | Alexandru Croitor | 2019-03-18 | 1 | -58/+61 |
| * | | | | | | | | | | | CMake: Use AUTOMOC/AUTOUIC/AUTORCC | Tobias Hunger | 2018-12-14 | 1 | -0/+5 |
| * | | | | | | | | | | | Begin port of qtbase to CMake | Simon Hausmann | 2018-11-01 | 2 | -0/+106 |
* | | | | | | | | | | | | DirectWrite font db: Fix unstretched font selection | Eskil Abrahamsen Blomfeldt | 2020-02-07 | 1 | -1/+1 |
* | | | | | | | | | | | | Experimental DirectWrite font database | Eskil Abrahamsen Blomfeldt | 2020-02-04 | 8 | -821/+1614 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-28 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | QStringList: use local storage in removeDuplicates() | Marc Mutz | 2020-01-26 | 1 | -4/+5 |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-15 | 1 | -0/+3 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-01-13 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix developer build with clang-cl failing due exception spec | Friedemann Kleint | 2020-01-10 | 1 | -0/+3 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Liang Qi | 2020-01-04 | 2 | -3/+3 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Freetype: Don't embolden bold fonts | Eskil Abrahamsen Blomfeldt | 2020-01-03 | 1 | -1/+1 |
| * | | | | | | | | | | | Windows: Fix offset of glyphs with DirectWrite font engine | Eskil Abrahamsen Blomfeldt | 2019-12-13 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-12-09 | 3 | -78/+78 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Tidy nullptr usage | Allan Sandfeld Jensen | 2019-12-06 | 3 | -80/+80 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-12-04 | 1 | -11/+0 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Ulf Hermann | 2019-12-03 | 1 | -11/+0 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | CoreText: Fix getting system fonts on recent macOS/iOS versions | Eskil Abrahamsen Blomfeldt | 2019-11-28 | 1 | -11/+0 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-11-30 | 2 | -23/+19 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | QWindowsFontDatabase: Check preferred family names for all fonts | Mårten Nordheim | 2019-11-29 | 2 | -23/+19 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-11-25 | 3 | -5/+6 |
|\| | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2019-11-23 | 1 | -3/+4 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | Compile fontconfig-related code on non-Unix platforms | Joerg Bornemann | 2019-11-20 | 1 | -3/+4 |
| * | | | | | | | | | | Avoid initializing QFlags with 0 or nullptr in further cases | Friedemann Kleint | 2019-11-22 | 1 | -1/+1 |