AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c5a3e5edd9
qt5base-lts/mkspecs
History
Frederik Gladhorn c5a3e5edd9 Merge remote-tracking branch 'origin/5.3' into 5.4 
The isAlwaysAskOption was removed in 3862171315
so manually removed code in
src/plugins/bearer/connman/qconnmanengine.cpp

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/tools/qcollator_macx.cpp
	src/corelib/tools/qstring.cpp
	src/gui/kernel/qwindow.cpp
	src/gui/kernel/qwindow_p.h
	src/gui/text/qtextengine.cpp
	src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
	src/plugins/platforms/android/qandroidinputcontext.cpp
	src/plugins/platforms/xcb/qglxintegration.cpp
	src/plugins/platforms/xcb/qglxintegration.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	src/testlib/qtestlog.cpp
	src/widgets/dialogs/qfiledialog.cpp
	src/widgets/kernel/qwindowcontainer.cpp
	tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
	tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
	tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp

Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
2014-09-23 11:23:36 +02: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++ Android: export ANDROID_SDK_BUILD_TOOLS_REVISION. 2014-07-31 14:16:51 +02:00
blackberry-armle-v7-qcc Rename QNX arm mkspecs to be aligned with SDP structure 2014-04-04 10:53:38 +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 BlackBerry,QNX: Switch to QMAKE_PLATFORM from CONFIG 2014-04-03 14:19:15 +02:00
common Enable rpath support on OS X and iOS platform 2014-08-09 15:37:39 +02:00
cygwin-g++ expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
darwin-g++ expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
devices Merge remote-tracking branch 'origin/5.3' into 5.4 2014-09-23 11:23:36 +02:00
features copy qml files only once in debug-and-release builds 2014-09-17 11:40:04 +02:00
freebsd-g++ Do not set QMAKE_{INC,LIB}DIR_{OPENGL,X11} in the freebsd mkspecs. 2014-08-15 19:54:02 +02:00
freebsd-g++46 Do not set QMAKE_{INC,LIB}DIR_{OPENGL,X11} in the freebsd mkspecs. 2014-08-15 19:54:02 +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++ purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00
irix-cc expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
irix-cc-64 expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
irix-g++ expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
irix-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
linux-arm-gnueabi-g++ Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-clang expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
linux-clang-libc++ Add mkspec for clang using libc++ on Linux. 2013-12-09 22:23:59 +01:00
linux-cxx expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
linux-g++ Merge remote-tracking branch 'origin/stable' into dev 2014-02-17 11:39:16 +01:00
linux-g++-32 Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-g++-64 Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-icc Add link-time optimization support for Clang, GCC and ICC 2014-07-23 11:12:02 +02:00
linux-icc-32 Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
linux-icc-64 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-kcc expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
linux-llvm Merge remote-tracking branch 'origin/stable' into dev 2014-02-17 11:39:16 +01:00
linux-lsb-g++ Merge remote-tracking branch 'origin/stable' into dev 2014-02-17 11:39:16 +01:00
linux-pgcc expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
lynxos-g++ expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01: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 Enable rpath support on OS X and iOS platform 2014-08-09 15:37:39 +02:00
macx-ios-clang Fix iOS simulator build after 1f0823c (Rewrite simd.prf to share more code) 2014-07-30 19:37:52 +02: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 update readme to current reality 2012-01-27 13:55:27 +01:00
netbsd-g++ Merge remote-tracking branch 'origin/stable' into dev 2014-02-17 11:39:16 +01:00
openbsd-g++ Merge remote-tracking branch 'origin/stable' into dev 2014-02-17 11:39:16 +01:00
qnx-armle-v7-qcc Merge remote-tracking branch 'origin/5.3' into dev 2014-07-01 16:25:19 +02:00
qnx-armv7le-qcc Merge remote-tracking branch 'origin/stable' into dev 2014-04-11 14:36:55 +02:00
qnx-x86-qcc QNX: Fix build for QNX 6.5 2014-06-05 23:24:47 +02:00
sco-cc expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
sco-g++ expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
solaris-cc expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
solaris-cc-64 expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01: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++ expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
solaris-g++-64 expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
tru64-cxx expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
tru64-g++ expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
unixware-cc expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
unixware-g++ expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
unsupported Do not set QMAKE_{INC,LIB}DIR_{OPENGL,X11} in the freebsd mkspecs. 2014-08-15 19:54:02 +02:00
win32-g++ Remove the last remnants of iWMMXt in Qt 2014-08-05 19:23:31 +02:00
win32-icc Add link-time optimization support for Clang, GCC and ICC 2014-07-23 11:12:02 +02:00
win32-msvc2005 encode the MSVC version in our mkspecs 2014-03-20 10:36:34 +01:00
win32-msvc2008 encode the MSVC version in our mkspecs 2014-03-20 10:36:34 +01:00
win32-msvc2010 fix C4275 warnings for MSVC 2010 build 2014-05-23 11:39:25 +02:00
win32-msvc2012 Windows XP target support for MSVC >= 2012 2014-04-03 18:31:45 +02:00
win32-msvc2013 Enforce strict string literal behaviors with MSVC 2013 2014-07-07 03:52:47 +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 winphone: deploy default font files as DirectWrite is not supported 2014-03-25 08:05:21 +01:00
winphone-arm-msvc2013 Add build support for Windows Phone 8.1 2014-05-22 07:59:49 +02:00
winphone-x86-msvc2012 winphone: deploy default font files as DirectWrite is not supported 2014-03-25 08:05:21 +01:00
winphone-x86-msvc2013 Add build support for Windows Phone 8.1 2014-05-22 07:59:49 +02:00
winrt-arm-msvc2012 WinRT: Use correct architecture values in manifests and vs 2014-02-07 15:29:53 +01:00
winrt-arm-msvc2013 WinRT: Use correct architecture values in manifests and vs 2014-02-07 15:29:53 +01:00
winrt-x64-msvc2012 WinRT: Use correct architecture values in manifests and vs 2014-02-07 15:29:53 +01:00
winrt-x64-msvc2013 WinRT: Use correct architecture values in manifests and vs 2014-02-07 15:29:53 +01:00
winrt-x86-msvc2012 WinRT: Use correct architecture values in manifests and vs 2014-02-07 15:29:53 +01:00
winrt-x86-msvc2013 WinRT: Use correct architecture values in manifests and vs 2014-02-07 15:29:53 +01:00