AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ea438b2508
qt5base-lts/mkspecs
History
Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsysinfo.h
	src/corelib/kernel/qcoreapplication_win.cpp
	src/gui/text/qdistancefield.cpp
	src/gui/text/qdistancefield_p.h
	src/plugins/platforms/windows/qwindowsglcontext.cpp
	src/plugins/platforms/windows/qwindowsglcontext.h

Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
2016-06-21 08:39:41 +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-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
common Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02: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 Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
features Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +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++ Updated license headers 2016-01-15 12:25:24 +00:00
hpux-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
hpuxi-acc-32 Updated license headers 2016-01-15 12:25:24 +00:00
hpuxi-acc-64 Updated license headers 2016-01-15 12:25:24 +00:00
hpuxi-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
hurd-g++ Updated license headers 2016-01-15 12:25:24 +00:00
integrity-armv7 Add INTEGRITY Framebuffer-based plugin as a platform plugin. 2016-03-22 10:42:03 +00:00
integrity-armv7-imx6 Add support for INTEGRITY with eglfs-viv. 2016-03-22 10:45:31 +00:00
integrity-x86 Add INTEGRITY Framebuffer-based plugin as a platform plugin. 2016-03-22 10:42:03 +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.7' into dev 2016-05-12 08:33:08 +02:00
macx-clang-32 Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
macx-g++ Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
macx-g++40 Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
macx-g++42 Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
macx-g++-32 Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
macx-llvm Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
macx-tvos-clang Add support for Apple tvOS 2016-05-17 16:11:23 +00:00
macx-xcode Updated license headers 2016-01-15 12:25:24 +00: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-06-20 08:00:26 +02:00
openbsd-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
qnx-armle-v7-qcc Updated license headers 2016-01-15 12:25:24 +00:00
qnx-x86-qcc Updated license headers 2016-01-15 12:25:24 +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 Updated license headers 2016-01-15 12:25:24 +00:00
tru64-g++ Updated license headers 2016-01-15 12:25:24 +00: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