AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fc35f71434
qt5base-lts/mkspecs
History
Frederik Gladhorn fc35f71434 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
	src/gui/image/qimage_conversions.cpp
	src/gui/opengl/qopenglextensions_p.h
	src/gui/text/qtextengine.cpp
	src/network/ssl/qsslsocket_openssl.cpp
	src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
	src/plugins/platforms/eglfs/qeglfsscreen.cpp
	src/plugins/platforms/eglfs/qeglfswindow.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
	src/plugins/platforms/windows/qwindowsnativeinterface.cpp
	src/plugins/platforms/windows/qwindowsscreen.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/plugins/platforms/windows/qwindowswindow.h
	src/plugins/platforms/xcb/qxcbdrag.h
	src/widgets/itemviews/qabstractitemview.cpp
	src/widgets/kernel/qwidget.cpp
	src/widgets/util/qsystemtrayicon_p.h
	tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp

Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp
conflicts.

Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
2015-02-10 09:42:25 +01:00
..
aix-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
aix-g++-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
aix-xlc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
aix-xlc-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
android-g++ Merge remote-tracking branch 'origin/5.4' into dev 2015-02-10 09:42:25 +01:00
blackberry-armle-v7-qcc QNX: Rename qcc-base-qnx-armv7le.conf mkspec. 2015-01-18 00:13:09 +01:00
blackberry-x86-qcc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
common Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev 2015-01-21 11:14:34 +01:00
cygwin-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
darwin-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
devices Remove unused function from rpi hooks 2015-02-05 19:20:39 +00:00
features Merge remote-tracking branch 'origin/5.4' into dev 2015-02-10 09:42:25 +01:00
freebsd-g++ Link against QMAKE_LIBS_EXECINFO when using backtrace(3). 2015-01-03 14:48:53 +01:00
freebsd-g++46 Link against QMAKE_LIBS_EXECINFO when using backtrace(3). 2015-01-03 14:48:53 +01:00
freebsd-icc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
haiku-g++ Haiku: Add support for Haiku to build system 2014-12-21 09:22:00 +01:00
hpux-acc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
hpux-acc-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
hpux-acc-o64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
hpux-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
hpux-g++-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
hpuxi-acc-32 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
hpuxi-acc-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
hpuxi-g++-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
hurd-g++ small improvements to the hurd-g++ mkspec 2014-12-29 17:53:58 +01:00
irix-cc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
irix-cc-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
irix-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
irix-g++-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-arm-gnueabi-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-clang Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-clang-libc++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-cxx Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-g++-32 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-g++-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-icc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-icc-32 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-icc-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-kcc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-llvm Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-lsb-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
linux-pgcc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
lynxos-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
macx-clang Add CFBundleIdentifier to the bundle Info.plist's 2014-11-10 16:04:12 +01:00
macx-clang-32 Add CFBundleIdentifier to the bundle Info.plist's 2014-11-10 16:04:12 +01:00
macx-g++ Add CFBundleIdentifier to the bundle Info.plist's 2014-11-10 16:04:12 +01:00
macx-g++40 Add CFBundleIdentifier to the bundle Info.plist's 2014-11-10 16:04:12 +01:00
macx-g++42 Add CFBundleIdentifier to the bundle Info.plist's 2014-11-10 16:04:12 +01:00
macx-g++-32 Add CFBundleIdentifier to the bundle Info.plist's 2014-11-10 16:04:12 +01:00
macx-icc Work around ICC compatibility problem with Apple headers 2014-11-22 20:02:49 +01:00
macx-ios-clang iOS: add AppIcon asset name to Xcode project 2015-01-16 11:24:09 +01:00
macx-llvm Add CFBundleIdentifier to the bundle Info.plist's 2014-11-10 16:04:12 +01:00
macx-xcode Update license headers and add new license files 2014-09-24 12:26:19 +02:00
modules update readme to current reality 2012-01-27 13:55:27 +01:00
netbsd-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
openbsd-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qnx-armle-v7-qcc QNX: Rename qcc-base-qnx-armv7le.conf mkspec. 2015-01-18 00:13:09 +01:00
qnx-x86-qcc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
sco-cc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
sco-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
solaris-cc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
solaris-cc-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
solaris-cc-64-stlport Update license headers and add new license files 2014-09-24 12:26:19 +02:00
solaris-cc-stlport Update license headers and add new license files 2014-09-24 12:26:19 +02:00
solaris-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
solaris-g++-64 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
tru64-cxx Update license headers and add new license files 2014-09-24 12:26:19 +02:00
tru64-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
unixware-cc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
unixware-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
unsupported nuke gbuild generator 2015-02-02 11:14:34 +00:00
win32-g++ Update license headers and add new license files 2014-09-24 12:26:19 +02:00
win32-icc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
win32-msvc2005 Create a common qmake configuration for all MSVC versions 2014-12-13 05:11:16 +01:00
win32-msvc2008 Create a common qmake configuration for all MSVC versions 2014-12-13 05:11:16 +01:00
win32-msvc2010 Create a common qmake configuration for all MSVC versions 2014-12-13 05:11:16 +01:00
win32-msvc2012 Create a common qmake configuration for all MSVC versions 2014-12-13 05:11:16 +01:00
win32-msvc2013 Create a common qmake configuration for all MSVC versions 2014-12-13 05:11:16 +01:00
win32-msvc2015 Add detection of and support for Visual Studio 2015 2014-12-13 05:11:25 +01:00
wince60standard-armv4i-msvc2005 WinCE: fix DLL build errors with CONFIG+=console 2014-10-08 13:05:05 +02:00
wince60standard-x86-msvc2005 WinCE: fix DLL build errors with CONFIG+=console 2014-10-08 13:05:05 +02:00
wince70embedded-armv4i-msvc2008 WinCE: fix DLL build errors with CONFIG+=console 2014-10-08 13:05:05 +02:00
wince70embedded-x86-msvc2008 WinCE: fix DLL build errors with CONFIG+=console 2014-10-08 13:05:05 +02:00
winphone-arm-msvc2013 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
winphone-x86-msvc2013 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
winrt-arm-msvc2013 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
winrt-x64-msvc2013 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
winrt-x86-msvc2013 Update license headers and add new license files 2014-09-24 12:26:19 +02:00