AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dc9e32caed
qt5base-lts/mkspecs
History
Frederik Gladhorn 4a8273a6fc Merge remote-tracking branch 'origin/stable' into dev 
For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
2013-11-26 22:35:48 +01:00
..
aix-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
aix-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
aix-xlc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
aix-xlc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
android-g++ Prepare for printing support. 2013-11-23 15:46:19 +01:00
blackberry-armle-v7-qcc Rename BlackBerry arm mkspecs to be aligned with NDK structure 2013-10-23 19:09:54 +02:00
blackberry-armv7le-qcc Rename BlackBerry arm mkspecs to be aligned with NDK structure 2013-10-23 19:09:54 +02:00
blackberry-x86-qcc
common Make console a no-op for WinRT 2013-11-14 18:53:48 +01:00
cygwin-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
darwin-g++ Add osx and darwin scopes to qmake. 2013-07-11 18:26:45 +02:00
devices Rename BlackBerry arm mkspecs to be aligned with NDK structure 2013-10-23 19:09:54 +02:00
features Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
freebsd-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
freebsd-g++46 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
freebsd-icc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-acc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-acc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-acc-o64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpuxi-acc-32 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpuxi-acc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpuxi-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hurd-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
irix-cc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
irix-cc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
irix-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
irix-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
linux-arm-gnueabi-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
linux-clang
linux-cxx Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-g++ Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-g++-32 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-g++-64 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-g++-maemo
linux-icc Update the ICC spec on Linux to actually compile stuff 2013-10-30 19:02:01 +01:00
linux-icc-32
linux-icc-64 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-kcc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
linux-llvm Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-lsb-g++ Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-pgcc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
lynxos-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
macx-clang qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-clang-32 qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-g++ qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-g++40 qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-g++42 qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-g++-32 qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-icc qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-ios-clang qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-llvm qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-xcode macx-xcode: Change wrapper to write to QMAKESPEC to change mkspec 2013-10-14 12:07:53 +02:00
modules
netbsd-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
openbsd-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
qnx-armv7le-qcc QNX: Make use of _readdir64_r 2013-11-25 18:15:35 +01:00
qnx-x86-qcc QNX: Make use of _readdir64_r 2013-11-25 18:15:35 +01:00
sco-cc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
sco-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
solaris-cc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
solaris-cc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
solaris-cc-64-stlport Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
solaris-cc-stlport Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
solaris-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
solaris-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
tru64-cxx Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
tru64-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
unixware-cc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
unixware-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
unsupported Add unsupported linux libc++ clang mkspec 2013-10-03 19:05:47 +02:00
win32-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
win32-icc Replace win32-icc/qplatformdefs.h with the MSVC one 2013-06-26 12:37:53 +02:00
win32-msvc2005 Provide a fallback for QT_STAT_LNK on windows 2013-10-31 23:37:54 +01:00
win32-msvc2008 qmake/vcxproj: add WIN64 macro for x86_46 builds 2013-05-07 15:02:59 +02:00
win32-msvc2010 qmake/vcxproj: add WIN64 macro for x86_46 builds 2013-05-07 15:02:59 +02:00
win32-msvc2012 set QMAKE_PLATFORM in win32-msvc2012 2013-05-07 15:03:03 +02:00
win32-msvc2013 win32-msvc2013: force synchronous writes to .pdb files 2013-10-25 12:29:43 +02:00
wince60standard-armv4i-msvc2005 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
wince60standard-x86-msvc2005 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
wince70embedded-armv4i-msvc2008 Remove not supported mkspecs for Windows CE. 2013-08-15 11:37:27 +02:00
wince70embedded-x86-msvc2008 Remove not supported mkspecs for Windows CE. 2013-08-15 11:37:27 +02:00
winphone-arm-msvc2012 qmake: Support MSVC2013 for WinRT builds 2013-10-25 09:00:37 +02:00
winphone-x86-msvc2012 qmake: Support MSVC2013 for WinRT builds 2013-10-25 09:00:37 +02:00
winrt-arm-msvc2012 qmake: Support MSVC2013 for WinRT builds 2013-10-25 09:00:37 +02:00
winrt-arm-msvc2013 qmake: Support MSVC2013 for WinRT builds 2013-10-25 09:00:37 +02:00
winrt-x64-msvc2012 qmake: Support MSVC2013 for WinRT builds 2013-10-25 09:00:37 +02:00
winrt-x64-msvc2013 qmake: Support MSVC2013 for WinRT builds 2013-10-25 09:00:37 +02:00
winrt-x86-msvc2012 qmake: Support MSVC2013 for WinRT builds 2013-10-25 09:00:37 +02:00
winrt-x86-msvc2013 qmake: Support MSVC2013 for WinRT builds 2013-10-25 09:00:37 +02:00