Liang Qi c7cdf3aac7 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/mimetypes/qmimeprovider.cpp src/corelib/mimetypes/qmimetype.cpp Change-Id: Ib483ddb6bfc380e7c8f195feca535703814c3872		2016-08-25 16:12:11 +02:00
..
android	Android: Make SDK detection its own qmake feature	2016-04-25 07:41:54 +00:00
data	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
mac	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-26 10:43:29 +02:00
qpa	qpa: Use LIBS_PRIVATE, not LIBS when linking in font database bits.	2016-05-19 12:45:36 +00:00
unix	Fix installation of debug symbols on Apple platforms.	2016-06-22 22:30:03 +00:00
win32	don't override user-provided dependencies for our extra compilers	2016-06-23 13:25:22 +00:00
winrt	winrt: Add capabilities as specified by modules	2016-04-07 20:03:55 +00:00
benchmark.prf	mkspecs: Add a benchmark "feature".	2016-03-02 21:24:54 +00:00
build_pass.prf
cmake_functions.prf
configure.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-23 10:29:37 +02:00
create_cmake.prf
ctest_testcase_common.prf	CMake: Don't attempt gui-tests if Qt is built with -no-gui	2016-01-18 13:00:03 +00:00
ctest_testcase_installed.prf
ctest_testcase.prf
dbusadaptors.prf
dbuscommon.pri	don't override user-provided dependencies for our extra compilers	2016-06-23 13:25:22 +00:00
dbusinterfaces.prf
declarative_debug.prf
default_post.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-11 20:08:50 +01:00
default_pre.prf	fix default inc/lib path detection on msys	2016-06-28 10:41:44 +00:00
designer_defines.prf
device_config.prf	configure: Separate host and build platform.	2015-10-30 13:14:51 +00:00
egl.prf	Adjust egl config.test to pass sysrooted libs	2016-04-08 23:37:07 +00:00
exceptions_off.prf
exceptions.prf
exclusive_builds_post.prf
exclusive_builds.prf	Add qgltf support to qmake	2015-10-26 16:29:25 +00:00
file_copies.prf	generalize references to exclusive builds	2016-07-13 14:27:07 +00:00
gcov.prf	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
include_source_dir.prf
incredibuild_xge.prf
java.prf	Android: Make SDK detection its own qmake feature	2016-04-25 07:41:54 +00:00
lex.prf	Restore the missing -P option for lex handling	2016-05-10 13:16:37 +00:00
link_ltcg.prf
link_pkgconfig.prf
ltcg.prf
moc.prf	make extra compiler targets depend on their respective compiler	2016-04-18 09:38:10 +00:00
no_debug_info.prf
plugin_bundle.prf	Ensure that CONFIG += plugin_bundle will create Mach-O bundles on OSX/iOS	2015-05-24 11:46:14 +00:00
precompile_header.prf
qfeatures.prf
qgltf.prf	don't override user-provided dependencies for our extra compilers	2016-06-23 13:25:22 +00:00
qlalr.prf	don't override user-provided dependencies for our extra compilers	2016-06-23 13:25:22 +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	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-18 11:07:51 +02:00
qmltestcase.prf
qt_android_deps.prf
qt_app.prf	QT_CONFIG simplification re debug_and_release and build_all	2016-05-17 15:31:40 +00:00
qt_build_config.prf	enable example installs for all modules	2016-05-18 09:07:38 +00:00
qt_build_extra.prf	fix conditions relating to host_build in non-cross builds	2016-08-24 15:28:50 +00:00
qt_build_paths.prf	make force_independent live up to its name	2015-11-30 14:26:23 +00:00
qt_clear_installs.prf	disable install targets for non-prefix builds	2016-01-12 15:16:37 +00:00
qt_common.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00
qt_config.prf
qt_docs_targets.prf	generalize references to exclusive builds	2016-07-13 14:27:07 +00:00
qt_docs.prf	fix docs creation in debug_and_release builds	2016-01-08 18:51:26 +00:00
qt_example_installs.prf	complain about examples which don't install themselves properly	2016-05-18 09:07:32 +00:00
qt_functions.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
qt_helper_lib.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-23 10:29:37 +02:00
qt_installs.prf
qt_module_headers.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qt_module_pris.prf	winrt: Add capabilities as specified by modules	2016-04-07 20:03:55 +00:00
qt_module.prf	fix logical mismerge from 5.6	2016-06-17 09:45:23 +00:00
qt_parts.prf
qt_plugin.prf	fix logical mismerge from 5.6	2016-06-17 09:45:23 +00:00
qt_targets.prf
qt_tool.prf	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
qt.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
resolve_config.prf
resolve_target.prf	Fix separate_debug_info with no_plugin_name_prefix	2016-04-14 21:29:00 +00:00
resources.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
sanitizer.prf
silent.prf
simd.prf	configure: Add support for detecting AVX512 instructions	2015-09-25 20:29:22 +00:00
spec_post.prf	Add back osx compatibility check in QMAKE_PLATFORM.	2016-06-16 22:44:15 +00:00
spec_pre.prf	add support for copying arbitrary files	2016-04-27 21:08:40 +00:00
static_runtime.prf
testcase_targets.prf	mkspecs: Add a benchmark "feature".	2016-03-02 21:24:54 +00:00
testcase.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-11 20:08:50 +01:00
testcocoon.prf
testlib_defines.prf	Fixed compilation of auto tests using vc(x)proj files	2015-05-22 14:13:00 +00:00
uic.prf	don't override user-provided dependencies for our extra compilers	2016-06-23 13:25:22 +00:00
use_c_linker.prf
vxworks.prf
warn_off.prf	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
warn_on.prf	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
wayland-scanner.prf	don't override user-provided dependencies for our extra compilers	2016-06-23 13:25:22 +00:00
xctest.prf
yacc.prf	don't override user-provided dependencies for our extra compilers	2016-06-23 13:25:22 +00:00