Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af		2015-01-21 11:10:14 +01:00
..
android	Merge remote-tracking branch 'origin/5.3' into dev	2014-08-04 09:51:36 +02:00
data	CMake: Load plugin files unconditionally if present.	2014-06-22 12:55:34 +02:00
mac	Decouple caching of iOS/OSX SDK path and version in sdk.prf	2014-12-01 18:48:09 +01:00
qpa	Hide Harfbuzz from the outer world	2013-03-13 14:46:26 +01:00
unix	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00
win32	windeployqt: add clean step to toplevel makefile	2015-01-06 16:50:54 +01:00
winrt	WinRT: Refactor icon specification usage	2015-01-13 11:29:42 +01:00
build_pass.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
c++11.prf	Enable C++11 on OSX when using Clang	2013-04-05 14:23:23 +02:00
c++14.prf	Add support for CONFIG += c++14	2014-07-20 04:32:44 +02:00
cmake_functions.prf	Remove leading '/' from target paths.	2013-11-27 08:24:50 +01:00
configure.prf	Merge remote-tracking branch 'origin/5.3' into 5.4	2014-10-28 18:21:45 +01:00
create_cmake.prf	use the major qt version for the library stem also in cmake files	2015-01-08 01:06:14 +01:00
ctest_testcase_common.prf	CMake: Test with the NMake Makefiles generator on Windows.	2014-03-06 17:22:55 +01:00
ctest_testcase_installed.prf	Only run the cmake test in the install location if not already done.	2013-07-15 21:56:51 +02:00
ctest_testcase.prf	Always use forward slashes in paths passed to cmake.	2013-07-10 13:05:01 +02:00
dbusadaptors.prf	de-duplicate dbusadaptors.prf vs. dbusinterfaces.prf	2012-08-04 00:52:38 +02:00
dbuscommon.pri	dbuscommon.pri: Fix source file dependency	2013-10-30 14:50:02 +01:00
dbusinterfaces.prf	de-duplicate dbusadaptors.prf vs. dbusinterfaces.prf	2012-08-04 00:52:38 +02:00
declarative_debug.prf	Rename quick1_debug back to declarative_debug	2012-10-04 03:03:00 +02:00
default_post.prf	make -force-debug-info work for objective C	2014-09-26 15:35:57 +02:00
default_pre.prf	remove some unnecessary CONFIG additions	2012-12-17 14:08:17 +01:00
designer_defines.prf	dispose of library-bound feature files	2012-06-19 16:39:52 +02:00
device_config.prf	avoid that CROSS_COMPILE affects host builds	2014-08-01 14:36:51 +02:00
egl.prf	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00
exceptions_off.prf	turn off exceptions by default where they aren't required	2012-05-17 05:14:26 +02:00
exceptions.prf	turn off exceptions by default where they aren't required	2012-05-17 05:14:26 +02:00
exclusive_builds_post.prf	Rewrite qmake's exclusive-build feature	2013-10-25 20:50:51 +02:00
exclusive_builds.prf	Rewrite qmake's exclusive-build feature	2013-10-25 20:50:51 +02:00
gcov.prf	Integrate gcov support into Qt build system.	2013-08-07 13:38:07 +02:00
include_source_dir.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
incredibuild_xge.prf	untangle use of system vs. shell path(-list) semantics	2014-04-30 16:56:54 +02:00
java.prf	actually use DIRLIST_SEPARATOR	2014-10-01 10:56:13 +02:00
lex.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02: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	make the pkg-config error message more precise	2014-01-07 19:45:15 +01:00
ltcg.prf	Clean up ltcg.prf with variables, including a new static mode	2015-01-11 03:41:48 +01:00
moc.prf	Fix compilation when including files created in shadow dirs	2014-02-10 20:41:22 +01:00
no_debug_info.prf	Make no_debug_info also strip out -gstabs	2014-12-05 14:51:33 +01:00
precompile_header.prf	Fix build with precompile headers	2014-01-14 10:38:29 +01:00
qfeatures.prf	export QT_NO_<foo> equivalents to the build system	2013-10-31 19:49:15 +01:00
qlalr.prf	introduce qlalr feature	2014-01-20 09:26:54 +01:00
qml1_module.prf	mark a bunch of features as internal	2012-12-12 21:48:02 +01:00
qml1_plugin.prf	mark a bunch of features as internal	2012-12-12 21:48:02 +01:00
qml_debug.prf	Rename the 'declarative debug support' to 'qml debug support'	2012-03-31 16:33:04 +02:00
qml_module.prf	copy qml files only once in debug-and-release builds	2014-09-17 11:40:04 +02:00
qml_plugin.prf	use the right env var in qmlplugindump call	2014-06-05 17:11:55 +02:00
qmltestcase.prf	Distinguish between 'mac' and 'macx' qmake scopes	2013-03-05 20:59:45 +01:00
qt_android_deps.prf	Android: Allow modules to specify permissions/features	2013-11-07 16:37:37 +01:00
qt_app.prf	Strip bootstrapped binaries of unused sections	2014-05-19 19:33:15 +02:00
qt_build_config.prf	Revert "Build Qt for OS X and iOS with relative rpath"	2014-11-17 20:03:01 +01:00
qt_build_paths.prf	reshuffle path setup	2013-06-10 21:12:24 +02:00
qt_common.prf	Use the GCC and Clang __builtin_bswap intrinsics in qbswap	2014-12-20 01:41:00 +01:00
qt_config.prf	de-duplicate QT_MODULES	2013-10-23 13:43:27 +02:00
qt_docs_targets.prf	mark a bunch of features as internal	2012-12-12 21:48:02 +01:00
qt_docs.prf	pass (some) index dirs also during -prepare phase	2014-06-05 17:11:42 +02:00
qt_example_installs.prf	clear OBJECTIVE_SOURCES as well	2014-01-20 14:58:48 +01:00
qt_functions.prf	Haiku: Add support for Haiku to build system	2014-12-21 09:22:00 +01:00
qt_headersclean.prf	Remove -Wcast-align from QMAKE_CXXFLAGS.	2014-06-27 03:13:17 +02:00
qt_helper_lib.prf	fix too aggressive installation of helper libraries	2014-05-20 19:23:58 +02:00
qt_installs.prf	install .lib files for static libs again	2014-06-16 12:42:25 +02:00
qt_module_headers.prf	add support for explicitly declaring the module master header	2014-10-29 09:37:08 +01:00
qt_module_pris.prf	Fix linking of sources without LTCG to a static lib with LTCG	2014-12-01 21:33:31 +01:00
qt_module.prf	Set CFBundleIdentifier prefix for Qt frameworks	2014-11-17 20:03:23 +01:00
qt_parts.prf	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00
qt_plugin.prf	embed a VERSIONINFO resource into Qt plugins	2014-10-20 14:47:53 +02:00
qt_targets.prf	Update copyright year in tools output	2014-03-31 12:46:44 +02:00
qt_tool.prf	fix quoting and path separators in qtPrepareTool()	2014-05-23 11:39:25 +02:00
qt.prf	micro-optimization: make use of qtPrepareTool()'s new mode	2014-09-30 18:33:13 +02:00
resolve_config.prf	Don't make Info.plist for debug framework bundles	2014-10-01 10:56:37 +02:00
resolve_target.prf	Rewrite qmake's exclusive-build feature	2013-10-25 20:50:51 +02:00
resources.prf	rcc: Change two-pass feature from opt-out to opt-in	2014-11-15 08:47:10 +01:00
sanitizer.prf	Add support for gcc/clang's sanitize features	2014-10-02 19:45:00 +02:00
silent.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
simd.prf	Rewrite simd.prf to share more code	2014-07-25 17:48:53 +02:00
spec_post.prf	Add osx and darwin scopes to qmake.	2013-07-11 18:26:45 +02:00
spec_pre.prf	add some docu about the project loading sequence	2012-12-13 09:10:45 +01:00
testcase_targets.prf	factor out testcase_targets.prf	2012-12-03 15:56:28 +01:00
testcase.prf	untangle use of system vs. shell path(-list) semantics	2014-04-30 16:56:54 +02:00
testcocoon.prf	fix host vs. makefile directory separator mess	2012-07-28 00:09:45 +02:00
testlib_defines.prf	auto-generate module pris	2012-06-19 16:40:06 +02:00
uic.prf	fix rcc & uic .depend_commands	2013-06-15 21:39:34 +02:00
use_c_linker.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
vxworks.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
warn_off.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
warn_on.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
wayland-scanner.prf	Fix installation of private headers generated by wayland-scanner	2014-06-23 10:40:21 +02:00
yacc.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00