summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Change qHash() to work with size_t instead of uintLars Knoll2020-04-096-10/+10
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-081-0/+8
|\
| * qmake: Document QML_FOREIGN_METATYPESUlf Hermann2020-03-261-0/+8
* | Re-generate various CMake projects and configure after mergeSimon Hausmann2020-03-162-2/+2
* | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Simon Hausmann2020-03-164-22/+3
|\ \
| * \ Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2020-03-164-22/+3
| |\ \ | | |/
| | * Doc: Remove \contentspage commandsTopi Reinio2020-03-151-14/+0
| | * macOS: Merge qcore_mac cpp and mm filesTor Arne Vestbø2020-03-123-8/+3
* | | cmake: Remove APPLE prefix from platform namesTor Arne Vestbø2020-03-162-2/+2
* | | cmake: Fix naming when referring to Apple macOSTor Arne Vestbø2020-03-162-2/+2
|/ /
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-111-0/+35
|\ \ | |/
| * qmake: Document qmltypes and metatypesUlf Hermann2020-03-091-0/+35
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-035-8/+8
|\ \ | |/
| * QMake: Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-02-285-8/+8
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-263-0/+20
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-02-183-0/+20
| |\
| | * Windows: Add install/uninstall rules for target.targetsKai Koehne2020-02-141-0/+14
| | * qmake: Allow the use of a response file when building a libraryAndy Shaw2020-02-131-0/+2
| | * Doc: Document some missing CONFIG valuesYuhang Zhao2020-02-131-0/+4
* | | CMake: Fix c++ standard config tests with MSVCAlexandru Croitor2020-02-181-0/+3
* | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-02-132-2/+4
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-121-1/+3
| |\ \ | | |/
| | * Doc: Document the ltcg CONFIG valueJoerg Bornemann2020-02-101-1/+3
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-041-1/+1
| |\ \ | | |/
| | * Fix line ending in custom build steps of vcxproj filesJoerg Bornemann2020-01-301-1/+1
* | | Use C++17 for qmake and force the build of everything with C++17Olivier Goffart2020-02-081-1/+1
* | | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"Alexandru Croitor2020-02-075-2/+409
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-295-45/+25
| |\ \ \
| * | | | Post Merge FixesLeander Beernaert2020-01-242-0/+3
| * | | | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-2418-135/+228
| |\ \ \ \
| * | | | | Implement qtbase fixes for superbuildsJean-Michaël Celerier2020-01-081-1/+1
| * | | | | CMake: Add support for framework buildsJoerg Bornemann2020-01-061-1/+1
| * | | | | Remove superfluous qt_internal_add_target_aliases callJoerg Bornemann2019-12-111-2/+0
| * | | | | Post merge fixesLeander Beernaert2019-11-252-2/+6
| * | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-197-21/+20
| |\ \ \ \ \
| * | | | | | Regenerate src/*Alexandru Croitor2019-11-142-12/+12
| * | | | | | Fix developer build with -WerrorSimon Hausmann2019-10-153-2/+4
| * | | | | | Fix build of qmakeAlexandru Croitor2019-10-151-0/+1
| * | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-1418-134/+268
| |\ \ \ \ \ \
| * | | | | | | Regenerate qtbase after wip/qt6 -> wip/cmake mergeAlexandru Croitor2019-10-142-0/+9
| * | | | | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-1118-246/+189
| |\ \ \ \ \ \ \
| * | | | | | | | Regenerate qmake and bootstrap projectsAlexandru Croitor2019-10-071-6/+7
| * | | | | | | | Use pre-compiled headers when building Qt with cmakeMårten Nordheim2019-09-111-1/+2
| * | | | | | | | Merge branch 'wip/qt6' into wip/cmakeAlexandru Croitor2019-08-1519-194/+125
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-1112-85/+160
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix build of modules outside of QtBase when cross-compilingSimon Hausmann2019-06-241-8/+0
| * | | | | | | | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-06-146-6/+8
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "cmake: Make CMake superbuilds work"Alexandru Croitor2019-06-141-1/+1
| * | | | | | | | | | | cmake: Make CMake superbuilds workKevin Funk2019-06-141-1/+1
| * | | | | | | | | | | Automatically find apple frameworks when building a repoAlexandru Croitor2019-06-131-2/+0