summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
| * | | | | | | | | | | cmake: Add warnings_are_errors optionAlbert Astals Cid2019-06-054-4/+3
| * | | | | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-038-99/+68
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-0335-414/+619
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Allow building the tests directory as a standalone CMake projectAlexandru Croitor2019-05-221-3/+1
| * | | | | | | | | | | | | Implement developer / non-prefix buildsAlexandru Croitor2019-05-151-2/+7
| * | | | | | | | | | | | | Export tool config and target files for each relevant moduleAlexandru Croitor2019-05-021-0/+1
| * | | | | | | | | | | | | Fix qmake build after no longer linking against QtCoreAlexandru Croitor2019-04-291-2/+8
| * | | | | | | | | | | | | CMake: Do not link qmake against Qt (not even the bootstrap one)Tobias Hunger2019-04-291-0/+1
| * | | | | | | | | | | | | Merge commit 'dev' into 'wip/cmake-merge'Tobias Hunger2019-04-1634-596/+695
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix Windows buildAlexandru Croitor2019-03-181-0/+15
| * | | | | | | | | | | | | | Fix build of qmake on macOSAlexandru Croitor2019-02-271-4/+6
| * | | | | | | | | | | | | | cmake: Build qmake using CMakeKevin Funk2019-02-131-1/+139
| * | | | | | | | | | | | | | Fix make installSimon Hausmann2019-02-111-1/+1
| * | | | | | | | | | | | | | Begin port of qtbase to CMakeSimon Hausmann2018-11-011-0/+2
* | | | | | | | | | | | | | | Use a QMap instead of a QHash for the ProValueMapLars Knoll2020-02-031-1/+2
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2020-01-281-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Fix handling of the DEFINES_DEBUG/DEFINES_RELEASE variablesJoerg Bornemann2020-01-231-2/+5
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-284-43/+20
|\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Purge the dep_cd_cmd parameter from callExtraCompilerDependCommandJoerg Bornemann2020-01-244-19/+8
| * | | | | | | | | | | | De-duplicate the last occurrence of calling a depend_commandJoerg Bornemann2020-01-241-28/+16
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-192-3/+3
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-182-3/+3
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Doc: Fix qdoc compilation errors qtbaseNico Vertriest2020-01-172-3/+3
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-163-9/+27
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-153-9/+27
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Fix mkdir warning for object_parallel_to_source projectsJoerg Bornemann2020-01-141-1/+1
| | * | | | | | | | | | | doc: improve SUBDIRS documentation for dependency handlingSamuel Gaist2020-01-142-8/+26
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-132-0/+32
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-01-092-0/+32
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Doc: Extend the documentation about qmake scopesJoerg Bornemann2020-01-092-0/+32
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-104-29/+17
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-094-29/+17
| |\| | | | | | | | | | |