qt5base-lts/qmake
Qt Forward Merge Bot efd7757154 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	src/widgets/widgets/qabstractbutton.cpp
	src/widgets/widgets/qbuttongroup.cpp
	src/widgets/widgets/qbuttongroup.h
	src/widgets/widgets/qsplashscreen.cpp
	tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
        tests/benchmarks/opengl/main.cpp

  Needed update:
	src/plugins/platforms/cocoa/CMakeLists.txt

Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5
2020-04-22 15:28:01 +02:00
..
doc Android: update Android specific variables docs 2020-04-17 17:27:36 +03:00
generators Change qHash() to work with size_t instead of uint 2020-04-09 20:03:25 +02:00
library Change qHash() to work with size_t instead of uint 2020-04-09 20:03:25 +02:00
.prev_CMakeLists.txt Re-generate various CMake projects and configure after merge 2020-03-16 20:43:56 +01:00
cachekeys.h Change qHash() to work with size_t instead of uint 2020-04-09 20:03:25 +02:00
CMakeLists.txt Re-generate various CMake projects and configure after merge 2020-03-16 20:43:56 +01:00
main.cpp Merge remote-tracking branch 'origin/dev' into merge-dev 2020-01-24 13:17:33 +01:00
Makefile.unix Merge remote-tracking branch 'origin/5.15' into dev 2020-03-16 18:41:27 +01:00
Makefile.unix.macos macOS: Merge qcore_mac cpp and mm files 2020-03-12 06:07:35 +01:00
Makefile.unix.mingw
Makefile.unix.unix
Makefile.unix.win32 qmake: add $$read_registry() function 2019-01-05 20:33:07 +00:00
Makefile.win32 Use C++17 for qmake and force the build of everything with C++17 2020-02-08 09:49:07 +01:00
meta.cpp qmake: Remove dead code 2019-04-05 07:48:34 +00:00
meta.h qmake: Remove dead code 2019-04-05 07:48:34 +00:00
option.cpp Make Qt relocatable 2019-09-07 20:02:45 +02:00
option.h Remove QMake's -createstub option 2019-08-03 14:48:10 +02:00
project.cpp qmake: use std names on a linked list 2019-05-13 16:39:22 +00:00
project.h qmake: use std names on a linked list 2019-05-13 16:39:22 +00:00
property.cpp Remove leftovers from QML1 2019-10-10 11:28:19 +02:00
property.h
qmake_pch.h qmake: move QT_BEGIN_NAMESPACE to correct place 2018-12-19 19:21:35 +00:00
qmake-aux.pro
qmake.pro macOS: Merge qcore_mac cpp and mm files 2020-03-12 06:07:35 +01:00