Liang Qi ce09ef4313 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/windows/qwindowscontext.cpp src/plugins/platforms/windows/windows.pri src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/doc/src/widgets-and-layouts/gallery.qdoc Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f		2017-06-19 16:12:34 +02:00
..
android	don't auto-create install targets for static libs	2017-06-17 06:47:59 +00:00
data	make qconfig.pri export QT_<compiler>_VERSION variables again	2017-06-12 09:55:26 +00:00
mac	Only use -Xarch when specifying precompiled header if building multi arch	2017-06-12 16:05:33 +00:00
uikit	Fix CoreText font database build on watchOS	2017-03-30 22:54:31 +00:00
unix	Enable support for OpenVG	2016-11-17 15:00:00 +00:00
win32	Fix VS project generation for ActiveQt server projects	2017-05-23 06:56:47 +00:00
winrt	winrt: Do not add windeployqt dependency for static builds in VS	2017-05-08 10:12:34 +00:00
benchmark.prf
build_pass.prf
cmake_functions.prf
configure_base.prf	don't redirect licheck's stderr	2017-05-31 12:57:43 +00:00
configure.prf	make handling of built-in configure options data-driven	2016-12-13 18:55:28 +00:00
create_cmake.prf	stop exporting QT.*.{MAJOR,MINOR,PATCH}_VERSION in module pris	2017-02-06 16:33:18 +00:00
ctest_testcase_common.prf	stop exporting QT.*.{MAJOR,MINOR,PATCH}_VERSION in module pris	2017-02-06 16:33:18 +00:00
ctest_testcase_installed.prf
ctest_testcase.prf
dbusadaptors.prf
dbuscommon.pri
dbusinterfaces.prf
declarative_debug.prf
default_post.prf	Enable stack-protector-strong for QNX 7.0.0	2017-06-13 14:01:24 +00:00
default_pre.prf	fix QMAKE_DEFAULT_*DIRS resolution with apple SDK, take 2	2016-10-16 00:12:11 +00:00
designer_defines.prf
device_config.prf	nuke configure -host-option	2016-12-13 18:55:59 +00:00
egl.prf
exceptions_off.prf
exceptions.prf
exclusive_builds_post.prf
exclusive_builds.prf	fix xcodebuilds without -sdk iphonesimulator	2016-10-14 14:54:46 +00:00
file_copies.prf	Simplify built-in qmake install command	2017-05-04 09:40:48 +00:00
gcov.prf
include_source_dir.prf
incredibuild_xge.prf
java.prf
lex.prf	Fix building when lex source refers to a file generated by yacc	2016-11-01 04:41:21 +00:00
link_ltcg.prf	Support different job counts also for ICC LTO	2017-04-07 17:45:04 +00:00
link_pkgconfig.prf
ltcg.prf
moc.prf	Do not disable MSVC extensions when generating moc_predefs.h	2017-06-12 10:27:17 +00:00
no_debug_info.prf
plugin_bundle.prf
precompile_header.prf
qgltf.prf
qlalr.prf	fix qlalr invocation in silent builds	2016-12-07 06:54:33 +00:00
qmake_use.prf	fix usage of "empty" libraries	2017-02-22 07:45:52 +00:00
qml1_module.prf
qml1_plugin.prf
qml_debug.prf
qml_module.prf	Fix missing plugins.qmltypes in static builds	2016-08-17 15:45:51 +00:00
qml_plugin.prf	stop exporting QT.*.{MAJOR,MINOR,PATCH}_VERSION in module pris	2017-02-06 16:33:18 +00:00
qmltestcase.prf	qmltestcase: Allow a QML-only testcase to not require a C++ harness	2017-04-06 08:40:17 +00:00
qt_android_deps.prf
qt_app.prf	make handling of qml module search path saner	2016-11-25 17:31:02 +00:00
qt_build_config.prf	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-02-08 15:49:18 +01:00
qt_build_extra.prf	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-08-29 15:30:17 +02:00
qt_build_paths.prf
qt_clear_installs.prf
qt_common.prf	Enable stack-protector-strong for QNX 7.0.0	2017-06-13 14:01:24 +00:00
qt_config.prf	stop exporting QT.*.{libexecs,plugins,imports,qml} in module pris	2017-02-06 16:33:25 +00:00
qt_configure.prf	build the configure tests in the top-level build dir	2017-06-12 09:55:39 +00:00
qt_docs_targets.prf
qt_docs.prf
qt_example_installs.prf	make handling of qml module search path saner	2016-11-25 17:31:02 +00:00
qt_functions.prf	Merge remote-tracking branch 'gerrit/5.8' into dev	2016-11-05 01:53:17 +01:00
qt_helper_lib.prf	fix usage of "empty" libraries	2017-02-22 07:45:52 +00:00
qt_installs.prf	don't include injected headers into linker version script	2016-10-14 09:00:29 +00:00
qt_module_headers.prf	Merge remote-tracking branch 'origin/5.9' into dev	2017-05-07 13:08:18 +02:00
qt_module_pris.prf	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-27 10:42:08 +02:00
qt_module.prf	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-27 10:42:08 +02:00
qt_parts.prf	Introduce QMAKE_CD to enable us to cd from one Windows drive to another	2016-11-14 16:03:39 +00:00
qt_plugin.prf	Merge remote-tracking branch 'gerrit/dev' into HEAD	2017-02-01 21:00:55 +01:00
qt_targets.prf	qt_targets.prf: Bump copyright year	2017-01-18 10:25:53 +00:00
qt_tool.prf	write HOST_QT_TOOLS to qmodule.pri instead of qhost.pri	2016-12-13 18:55:48 +00:00
qt.prf	fix up static linking of plugins somewhat	2017-01-19 21:48:10 +00:00
resolve_config.prf	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
resolve_target.prf	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
resources.prf	features/resources.prf: fix use of unescaped backslash	2017-01-23 10:27:07 +00:00
sanitizer.prf
silent.prf
simd.prf	Add proper detection of x86 RDRAND instruction	2017-06-12 06:14:48 +00:00
spec_post.prf	Introduce QMAKE_CD to enable us to cd from one Windows drive to another	2016-11-14 16:03:39 +00:00
spec_pre.prf	factor out QMAKE_USE* processing to a separate prf file	2016-10-04 20:20:06 +00:00
static_runtime.prf
testcase_targets.prf
testcase.prf	Merge remote-tracking branch 'origin/5.8' into dev	2016-11-17 14:43:26 +01:00
testcocoon.prf
testlib_defines.prf
toolchain.prf	complain when toolchain.prf fails to run the compiler	2017-06-12 09:55:32 +00:00
uic.prf
use_c_linker.prf
vxworks.prf
warn_off.prf
warn_on.prf
wayland-scanner.prf	System library fix for wayland-scanner	2017-03-20 14:19:59 +00:00
xctest.prf
yacc.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-04 11:39:15 +01:00