Liang Qi 01bc69f99f Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/util/qcompleter.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmdisubwindow.cpp Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973		2017-09-20 11:58:32 +02:00
..
android	Use libc++ instead of libstdc++ when compiling with android-clang mkspec	2017-08-23 12:47:58 +00:00
data	Propagate all module defines to CMake config files	2017-08-15 16:44:38 +00:00
mac	Allow using Xcode Command Line Tools to build Qt	2017-06-29 02:00:12 +00:00
uikit	Compare versions in qmake files with versionAtLeast	2017-08-02 21:08:07 +00:00
unix	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-09-06 13:26:31 +02:00
win32	Fix VS project generation for ActiveQt server projects	2017-05-23 06:56:47 +00:00
winrt	winrt: remove legacy checks	2017-07-03 05:32:54 +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	Fix CMake version resolving	2017-08-16 15:35:40 +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	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-09-20 11:58:32 +02: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
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	Windows: Automatically set metadata for all Qt apps	2017-07-31 06:19:06 +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	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-09-20 11:58:32 +02: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	configure: Disable warnings in configure tests	2017-08-24 03:47:10 +00:00
qt_docs_targets.prf
qt_docs.prf
qt_example_installs.prf	refuse to build examples inside the qt source tree stand-alone	2017-08-15 10:55:48 +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	Compare versions in qmake files with versionAtLeast	2017-08-02 21:08:07 +00: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	Compare versions in qmake files with versionAtLeast	2017-08-02 21:08:07 +00: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	Make Qt's VersionInformation resource strings consistent	2017-07-03 06:02:03 +00:00
qt_tool.prf	Windows: Automatically set metadata for all Qt apps	2017-07-31 06:19:06 +00:00
qt.prf	fix up static linking of plugins somewhat	2017-01-19 21:48:10 +00:00
resolve_config.prf
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	Fix CONFIG+=silent for MSVC non-inference rules	2017-07-14 18:49:56 +00:00
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	Fix conditions in some QMAKE_COMPILER_DEFINES assignments	2017-09-15 09:03:12 +00:00
uic.prf	uic: Add -no-stringliteral option	2017-08-03 09:59:15 +00:00
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	Allow using Xcode Command Line Tools to build Qt	2017-06-29 02:00:12 +00:00
yacc.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-04 11:39:15 +01:00