Liang Qi 1fadc7292b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/plugins/platforms/windows/qwindowsfontengine.cpp src/plugins/platforms/windows/qwindowsnativeimage.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I649b32b260ce0ed2d6a5089021daa0d6a8db85f7		2016-02-24 13:31:14 +01:00
..
android	Fixed recently added "excess colon in front of brace" qmake warning	2016-01-06 13:47:40 +00:00
data	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
mac	xcodeSDKInfo: return the correct path based on the specified SDK.	2016-02-18 04:34:05 +00:00
qpa
unix	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
win32	Fixed recently added "excess colon in front of brace" qmake warning	2016-01-06 13:47:40 +00:00
winrt	Remove hardcoded capabilities in Windows 10 manifest template	2015-11-19 19:59:17 +00:00
build_pass.prf
cmake_functions.prf
configure.prf	QMake: Add option to set qt.conf file.	2015-10-27 13:14:00 +00:00
create_cmake.prf	don't overengineer DESTDIR calculation	2015-04-23 09:49:23 +00:00
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
dbusinterfaces.prf
declarative_debug.prf
default_post.prf	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
default_pre.prf	Turn C++11 on by default if the compiler supports C++11	2015-10-16 07:25:21 +00:00
designer_defines.prf
device_config.prf	configure: Separate host and build platform.	2015-10-30 13:14:51 +00:00
egl.prf
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
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	actually use DIRLIST_SEPARATOR	2014-10-01 10:56:13 +02:00
lex.prf	Use QMAKE_MOD_LEX/QMAKE_MOD_YACC in lex/yacc features	2015-09-24 13:49:29 +00:00
link_ltcg.prf	Clean up ltcg.prf with variables, including a new static mode	2015-01-11 03:41:48 +01:00
link_pkgconfig.prf
ltcg.prf	Clean up ltcg.prf with variables, including a new static mode	2015-01-11 03:41:48 +01:00
moc.prf	Windows: Change the mocinclude extension to .opt	2015-09-29 09:16:00 +00:00
no_debug_info.prf	Make no_debug_info also strip out -gstabs	2014-12-05 14:51:33 +01:00
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	Add qgltf support to qmake	2015-10-26 16:29:25 +00:00
qlalr.prf
qml1_module.prf
qml1_plugin.prf
qml_debug.prf
qml_module.prf	Include the qml files into a resource when building a static plugin	2015-12-01 16:11:17 +00:00
qml_plugin.prf	don't call qtAddToolEnv() directly	2015-12-15 16:34:47 +00:00
qmltestcase.prf
qt_android_deps.prf
qt_app.prf	introduce -optimized-tools option	2015-11-17 20:21:54 +00:00
qt_build_config.prf	disable install targets for non-prefix builds	2016-01-12 15:16:37 +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	Add some interesting warning options to the compilation	2015-12-05 00:10:33 +00:00
qt_config.prf	support spaces in build and install dirs	2015-02-17 18:28:00 +00:00
qt_docs_targets.prf	fix docs creation in debug_and_release builds	2016-01-08 18:51:26 +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	sanitize qt rpath handling, in particular on mac	2015-09-17 16:36:12 +00:00
qt_functions.prf	Merge "Merge dev into 5.7" into refs/staging/5.7	2016-02-17 19:57:54 +00:00
qt_helper_lib.prf	load qt_common in qt_helper_lib	2016-02-19 17:08:56 +00:00
qt_installs.prf
qt_module_headers.prf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-24 13:31:14 +01:00
qt_module_pris.prf	unbreak propagation of dependencies on private modules	2016-01-13 15:59:05 +00:00
qt_module.prf	unhack qt_install_headers vs. lib_bundle	2016-02-19 17:09:02 +00:00
qt_parts.prf	fix distclean targets	2015-04-23 19:16:57 +00:00
qt_plugin.prf	sanitize qt rpath handling, in particular on mac	2015-09-17 16:36:12 +00:00
qt_targets.prf	Update copyright headers	2015-02-11 06:49:51 +00:00
qt_tool.prf	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
qt.prf	Revert "Fix shared library framework builds of Qt with a platform suffix."	2016-02-17 13:06:45 +00:00
resolve_config.prf	Don't make Info.plist for debug framework bundles	2014-10-01 10:56:37 +02:00
resolve_target.prf	unify handling of library prefixes and extensions	2015-10-01 16:19:30 +00:00
resources.prf	support specifying directories in RESOURCES	2016-02-01 15:50:51 +00:00
sanitizer.prf	Add support for gcc/clang's sanitize features	2014-10-02 19:45:00 +02:00
silent.prf
simd.prf	configure: Add support for detecting AVX512 instructions	2015-09-25 20:29:22 +00:00
spec_post.prf	fix installing unix dll symlinks on windows hosts	2015-06-01 13:26:57 +00:00
spec_pre.prf	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
static_runtime.prf	Windows: Add -static-runtime configure option	2015-03-11 09:26:37 +00:00
testcase_targets.prf
testcase.prf	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-08 12:35:24 +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
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
xctest.prf	testlib: Don't limit linking to XCTest to Xcode projects	2015-03-30 13:26:58 +00:00
yacc.prf	Use QMAKE_MOD_LEX/QMAKE_MOD_YACC in lex/yacc features	2015-09-24 13:49:29 +00:00