AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
53cbc3c5b4
qt5base-lts/mkspecs/common
History
Lars Knoll 0f315adf91 Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	.qmake.conf
	sc/corelib/io/qfsfileengine_p.h
	src/corelib/io/qstorageinfo_unix.cpp
	src/platformsupport/eglconvenience/qeglpbuffer_p.h
	src/platformsupport/input/libinput/qlibinputkeyboard.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/plugins/platforms/ios/qiosscreen.h
	src/plugins/platforms/ios/qioswindow.h
	src/plugins/platforms/ios/quiview.mm
	src/printsupport/dialogs/qpagesetupdialog_unix_p.h
	src/printsupport/dialogs/qprintpreviewdialog.cpp
	src/printsupport/widgets/qcupsjobwidget_p.h
	src/widgets/widgets/qmenu.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
2018-01-02 09:58:44 +01:00
..
aix Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
android Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
bsd Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
c89 Updated license headers 2016-01-15 12:25:24 +00:00
integrity Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
mac Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
nacl Updated license headers 2016-01-15 12:25:24 +00:00
posix Updated license headers 2016-01-15 12:25:24 +00:00
qnx Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
uikit Merge remote-tracking branch 'origin/5.8' into dev 2016-10-13 09:49:38 +02:00
winrt_winphone Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-04 13:41:04 +02:00
android-base-head.conf Set the CROSS_COMPILE variable in Android mkspecs 2017-09-06 10:41:43 +00:00
android-base-tail.conf Set the CROSS_COMPILE variable in Android mkspecs 2017-09-06 10:41:43 +00:00
angle.conf Restore behavior of using libEGL and libGLESv2 as default for angle 2017-05-11 08:35:54 +00:00
clang-mac.conf Move Apple-specific -fapplication-extensions option to the mkspec 2017-04-12 03:37:01 +00:00
clang.conf Fix the naming of an LLVM tool in common/clang.conf 2016-07-02 16:35:01 +00:00
g++-base.conf Update mkspecs to use "c++11" instead of "c++0x" 2015-10-18 04:46:45 +00:00
g++-macx.conf
g++-unix.conf
g++.conf
gcc-base-mac.conf MinGW: reuse gcc-base.conf and g++-base.conf 2016-11-29 16:23:58 +00:00
gcc-base-unix.conf Generate gdb indexing for faster debugging on Linux 2017-12-19 11:50:12 +00:00
gcc-base.conf Merge remote-tracking branch 'origin/5.9' into dev 2017-07-13 16:36:10 -07:00
ghs-base.conf Remove QMAKE_LIBS_CORE variable 2017-08-28 13:10:38 +00:00
ghs-integrity-armv7.conf Add -bigswitch on INTEGRITY 2017-04-03 08:08:46 +00:00
ghs-integrity-armv8.conf Add INTEGRITY mkspec for ARMv8 Drive CX 2017-05-29 09:46:12 +00:00
ghs-integrity-x86.conf Add support for building for INTEGRITY using GHS toolchain. 2016-03-21 16:49:54 +00:00
ios.conf Add support for Apple tvOS 2016-05-17 16:11:23 +00:00
linux.conf Merge remote-tracking branch 'origin/5.9' into dev 2017-08-31 14:31:31 +02:00
llvm.conf
mac.conf Merge remote-tracking branch 'origin/5.7' into 5.8 2016-10-06 20:12:27 +02:00
macx.conf Share the multi-arch infrastructure between UIKit and macOS 2016-09-29 21:51:18 +00:00
msvc-desktop.conf Merge remote-tracking branch 'origin/5.9' into 5.10 2017-12-30 12:09:53 +01:00
msvc-version.conf Add support for AVX-512 intrinsics found in MSVC 2017 15.3 2017-11-30 08:30:37 +00:00
qcc-base-qnx-aarch64le.conf Add some 64-bit QNX platforms 2016-06-22 14:59:26 +00:00
qcc-base-qnx-armle-v7.conf move inclusions of unix.conf (and related files) near the top 2015-10-01 16:19:27 +00:00
qcc-base-qnx-x86-64.conf Add some 64-bit QNX platforms 2016-06-22 14:59:26 +00:00
qcc-base-qnx-x86.conf move inclusions of unix.conf (and related files) near the top 2015-10-01 16:19:27 +00:00
qcc-base-qnx.conf make mkspecs not mess up -rpath-link 2017-05-31 12:57:14 +00:00
qcc-base.conf Merge remote-tracking branch 'origin/5.9' into dev 2017-06-19 16:12:34 +02:00
sanitize.conf
shell-unix.conf centralize setup of shell-related variables in spec_post.prf 2015-03-06 19:08:40 +00:00
shell-win32.conf centralize setup of shell-related variables in spec_post.prf 2015-03-06 19:08:40 +00:00
solaris.conf Remove unused mkspecs variable QMAKE_LIBS_NIS 2017-08-28 13:10:44 +00:00
tvos.conf qmake: enable bitcode also for iOS 2016-08-19 21:06:05 +00:00
uikit.conf Remove useless DARWIN_NO_CARBON define from uikit mkspecs 2017-01-24 19:40:29 +00:00
unix.conf unify handling of library prefixes and extensions 2015-10-01 16:19:30 +00:00
watchos.conf qmake: enable bitcode also for iOS 2016-08-19 21:06:05 +00:00
windows-vulkan.conf Fix WebEngine build when VULKAN_SDK environment variable is present 2017-07-25 13:48:41 +00:00