AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c1b1e58de8
qt5base-lts/mkspecs
History
Liang Qi 7555a92581 Merge remote-tracking branch 'origin/5.7' into 5.8 
5971b88e is not needed in new configure.

This merge also reverts "fix QMAKE_DEFAULT_*DIRS resolution with
apple SDK", 2c9d15d7, because it breaks iOS build with new
configure system.

Conflicts:
	mkspecs/features/default_pre.prf
	mkspecs/features/mac/toolchain.prf
	mkspecs/features/toolchain.prf
	src/dbus/qdbusconnection.cpp
	src/plugins/sqldrivers/mysql/qsql_mysql.cpp
	src/sql/drivers/mysql/qsql_mysql.cpp
	src/widgets/widgets/qmenubar.cpp
	src/widgets/widgets/qmenubar_p.h
	tools/configure/configureapp.cpp
	tools/configure/environment.cpp
	tools/configure/environment.h

Change-Id: I995533dd334211ebd25912db05b639d6f908aaec
2016-09-21 11:57:52 +02:00
..
aix-g++ Updated license headers 2016-01-15 12:25:24 +00:00
aix-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
aix-xlc Updated license headers 2016-01-15 12:25:24 +00:00
aix-xlc-64 Updated license headers 2016-01-15 12:25:24 +00:00
android-clang Revert "Android: use gold linker" 2016-08-16 13:31:38 +00:00
android-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-18 11:07:51 +02:00
common fix QMAKE_DEFAULT_*DIRS resolution with apple SDK 2016-09-15 20:01:33 +00:00
cygwin-g++ Updated license headers 2016-01-15 12:25:24 +00:00
darwin-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
devices Add a spec for NXP Colibri VF50/61 2016-09-10 14:54:16 +00:00
features Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
freebsd-clang Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
freebsd-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
haiku-g++ Updated license headers 2016-01-15 12:25:24 +00:00
hpux-acc Updated license headers 2016-01-15 12:25:24 +00:00
hpux-acc-64 Updated license headers 2016-01-15 12:25:24 +00:00
hpux-acc-o64 Updated license headers 2016-01-15 12:25:24 +00:00
hpux-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
hpux-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
hpuxi-acc-32 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
hpuxi-acc-64 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
hpuxi-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
hurd-g++ Clean up some unused variables in the qmake.conf files 2016-06-23 19:43:04 +00:00
integrity-armv7 Convert the old feature system 2016-09-15 08:24:10 +00:00
integrity-armv7-imx6 Convert the old feature system 2016-09-15 08:24:10 +00:00
integrity-x86 Convert the old feature system 2016-09-15 08:24:10 +00:00
irix-cc Updated license headers 2016-01-15 12:25:24 +00:00
irix-cc-64 Updated license headers 2016-01-15 12:25:24 +00:00
irix-g++ Updated license headers 2016-01-15 12:25:24 +00:00
irix-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
linux-arm-gnueabi-g++ Updated license headers 2016-01-15 12:25:24 +00:00
linux-clang Updated license headers 2016-01-15 12:25:24 +00:00
linux-clang-libc++ Updated license headers 2016-01-15 12:25:24 +00:00
linux-cxx Updated license headers 2016-01-15 12:25:24 +00:00
linux-g++ Updated license headers 2016-01-15 12:25:24 +00:00
linux-g++-32 Updated license headers 2016-01-15 12:25:24 +00:00
linux-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
linux-icc Updated license headers 2016-01-15 12:25:24 +00:00
linux-icc-32 Updated license headers 2016-01-15 12:25:24 +00:00
linux-icc-64 Updated license headers 2016-01-15 12:25:24 +00:00
linux-kcc Updated license headers 2016-01-15 12:25:24 +00:00
linux-llvm Updated license headers 2016-01-15 12:25:24 +00:00
linux-lsb-g++ Updated license headers 2016-01-15 12:25:24 +00:00
linux-pgcc Updated license headers 2016-01-15 12:25:24 +00:00
lynxos-g++ Updated license headers 2016-01-15 12:25:24 +00:00
macx-clang Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-clang-32 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-g++ Merge remote-tracking branch 'origin/5.7' into dev 2016-06-23 14:24:55 +02:00
macx-g++40 Merge remote-tracking branch 'origin/5.7' into dev 2016-06-23 14:24:55 +02:00
macx-g++42 Merge remote-tracking branch 'origin/5.7' into dev 2016-06-23 14:24:55 +02:00
macx-g++-32 Merge remote-tracking branch 'origin/5.7' into dev 2016-06-23 14:24:55 +02:00
macx-icc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-25 14:03:45 +02:00
macx-ios-clang Make TARGETED_DEVICE_FAMILY variable platform independent 2016-09-05 15:24:54 +00:00
macx-llvm Merge remote-tracking branch 'origin/5.7' into dev 2016-06-23 14:24:55 +02:00
macx-tvos-clang Make TARGETED_DEVICE_FAMILY variable platform independent 2016-09-05 15:24:54 +00:00
macx-watchos-clang Make TARGETED_DEVICE_FAMILY variable platform independent 2016-09-05 15:24:54 +00:00
macx-xcode Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-25 16:12:11 +02:00
modules Adjust wiki links to the new redirect 2015-03-04 15:36:12 +00:00
netbsd-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-04 15:58:39 +02:00
openbsd-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
qnx-aarch64le-qcc Convert the old feature system 2016-09-15 08:24:10 +00:00
qnx-armle-v7-qcc Convert the old feature system 2016-09-15 08:24:10 +00:00
qnx-x86-64-qcc Convert the old feature system 2016-09-15 08:24:10 +00:00
qnx-x86-qcc Convert the old feature system 2016-09-15 08:24:10 +00:00
sco-cc Updated license headers 2016-01-15 12:25:24 +00:00
sco-g++ Updated license headers 2016-01-15 12:25:24 +00:00
solaris-cc Updated license headers 2016-01-15 12:25:24 +00:00
solaris-cc-64 Updated license headers 2016-01-15 12:25:24 +00:00
solaris-cc-64-stlport Updated license headers 2016-01-15 12:25:24 +00:00
solaris-cc-stlport Updated license headers 2016-01-15 12:25:24 +00:00
solaris-g++ Updated license headers 2016-01-15 12:25:24 +00:00
solaris-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
tru64-cxx Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
tru64-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
unixware-cc Updated license headers 2016-01-15 12:25:24 +00:00
unixware-g++ Updated license headers 2016-01-15 12:25:24 +00:00
unsupported Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
win32-clang-msvc2015 Add initial clang-cl support to Qt 2016-02-11 12:54:06 +00:00
win32-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-29 12:34:31 +01:00
win32-icc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-23 08:29:43 +01:00
win32-msvc2005 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2008 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2010 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2012 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2015 Updated license headers 2016-01-15 12:25:24 +00:00
winphone-arm-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winphone-x86-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-arm-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-arm-msvc2015 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-x64-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-x64-msvc2015 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-x86-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-x86-msvc2015 Updated license headers 2016-01-15 12:25:24 +00:00