qt5base-lts/mkspecs
Liang Qi a15c3d086d Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/dbus/qdbusconnection_p.h
	src/dbus/qdbusintegrator.cpp
	src/dbus/qdbusintegrator_p.h
	tests/auto/corelib/io/qdir/qdir.pro
	tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp

Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc
2016-01-26 16:27:28 +01: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++ Updated license headers 2016-01-15 12:25:24 +00:00
common Updated license headers 2016-01-15 12:25:24 +00:00
cygwin-g++ Updated license headers 2016-01-15 12:25:24 +00:00
darwin-g++ Updated license headers 2016-01-15 12:25:24 +00:00
devices Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
features Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
freebsd-g++ Updated license headers 2016-01-15 12:25:24 +00:00
freebsd-g++46 Updated license headers 2016-01-15 12:25:24 +00:00
freebsd-icc Updated license headers 2016-01-15 12:25:24 +00: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
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 Updated license headers 2016-01-15 12:25:24 +00:00
macx-clang-32 Updated license headers 2016-01-15 12:25:24 +00:00
macx-g++ Updated license headers 2016-01-15 12:25:24 +00:00
macx-g++40 Updated license headers 2016-01-15 12:25:24 +00:00
macx-g++42 Updated license headers 2016-01-15 12:25:24 +00:00
macx-g++-32 Updated license headers 2016-01-15 12:25:24 +00:00
macx-icc Updated license headers 2016-01-15 12:25:24 +00:00
macx-ios-clang Updated license headers 2016-01-15 12:25:24 +00:00
macx-llvm Updated license headers 2016-01-15 12:25:24 +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++ Updated license headers 2016-01-15 12:25:24 +00:00
openbsd-g++ Updated license headers 2016-01-15 12:25:24 +00: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 Updated license headers 2016-01-15 12:25:24 +00:00
win32-g++ Updated license headers 2016-01-15 12:25:24 +00:00
win32-icc Updated license headers 2016-01-15 12:25:24 +00: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
wince60standard-armv4i-msvc2005 Updated license headers 2016-01-15 12:25:24 +00:00
wince60standard-x86-msvc2005 Updated license headers 2016-01-15 12:25:24 +00:00
wince70embedded-armv4i-msvc2008 Updated license headers 2016-01-15 12:25:24 +00:00
wince70embedded-x86-msvc2008 Updated license headers 2016-01-15 12:25:24 +00:00
wince80colibri-armv7-msvc2012 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