Merge branch 'stable' into dev

Conflicts:
	examples/widgets/painting/shared/shared.pri
	src/corelib/tools/qharfbuzz_p.h
	src/corelib/tools/qunicodetools.cpp
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp

Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3

3 files changed, 290 insertions, 38 deletions

diff --git a/dist/README b/dist/README
index 2828cf1b37..d9eed68fb7 100644
--- a/dist/README
+++ b/dist/README
@@ -91,10 +91,6 @@ Running Example Applications
 You can open example applications in the Qt Creator Welcome mode to build and
 run them.
 
-Ready to run example applications are located in
-<install_dir>/<version>/<compiler>/examples. You can launch the C++ based
-examples directly either from command line or your file system browser.
-
 The QML based Quick 2 examples are located in
 <install_dir>/<version>/<compiler>/examples/qtdeclarative. You can load them
 using the qmlscene application.
@@ -156,3 +152,8 @@ Much more information is available at:
 We hope you will enjoy using Qt!
 
 - The Qt developers @ qt-project.org
+
+
+
+			In memory of Trond Kjernåsen.
+			 You will not be forgotten.
\ No newline at end of file
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index 5987c95108..6d58c21133 100644
--- a/dist/changes-5.0.0
+++ b/dist/changes-5.0.0
@@ -11,6 +11,14 @@ information about a particular change.
 *                       Source incompatible changes                        *
 ****************************************************************************
 
+- The Qt 3 support module and all related code was removed.
+
+- QAtomicInt's and QAtomicPointer's non-atomic convenience methods
+  (i.e., operator=, operator int / operator T*, operator!, operator==,
+  operator!= and operator->) have been removed as they did implicit
+  loads and stores of unspecified memory ordering. Code dealing with
+  is expected to use load(), loadAquire(), store() and storeRelease()
+  as necessary instead.
 
 - QObject
   * The signatures of the connectNotify() and disconnectNotify() functions
@@ -60,6 +68,8 @@ information about a particular change.
   in Qt4, so these methods return a bool now. If your code used the undocumented
   QBool, simply replace it with bool.
 
+- The old macros TRUE and FALSE have been removed, use true and false instead.
+
 - qIsDetached<> has been removed without replacement.
 
 - The return type of QFlags<Enum>::operator int() now matches the Enum's underlying
@@ -274,23 +284,6 @@ information about a particular change.
 - QIconEngineV2 was merged into QIconEngine
   You might need to adjust your code if it used a QIconEngine.
 
-- qmake
-  * Projects which explicitly set an empty TARGET are considered broken now.
-  * The makespec and .qmake.cache do not see build pass specific variables any more.
-  * load()/include() with a target namespace and infile()/$$fromfile() now start with
-    an entirely pristine context.
-  * Configure's -sysroot and -hostprefix are now handled slightly differently.
-    The QT_INSTALL_... properties are now automatically prefixed with the sysroot;
-    the raw values are available as QT_INSTALL_.../raw and the sysroot as QT_SYSROOT.
-    The new QT_HOST_... properties can be used to refer to the Qt host tools.
-  * Several functions and built-in variables were modified to return normalized paths.
-  * The -(no-)exception flags in configure have been removed. Qt modules are now compiled
-    without exceptions by default, as they do not use them and can neither handle them
-    properly. Qt Core still has exceptions enabled to correctly throw bad_alloc exceptions
-    in our tool classes.
-    Whether code should be compiled with exception support enabled or disabled can be
-    controlled by a CONFIG += exceptions/exceptions_off setting in the .pro file.
-
 - QTextCodecPlugin has been removed since it is no longer used. All text codecs
   are now built into QtCore.
 
@@ -838,6 +831,18 @@ appended in parantheses.
 *                      Platform Specific Changes                           *
 ****************************************************************************
 
+The Qt platform implementations have been rewritten as plugins for the Qt
+Platform Abstraction (QPA):
+
+* The platform plugin(s) needs to be bundled when applications are deployed.
+* The platform implementations are in large parts rewrites.
+* Q_WS_* defines are no longer defined. Q_OS_* is.
+* Some platform specific functionality and API is missing from the 5.0
+  release and will be added later.
+* Platform spesific functionality will be added in separate modules:
+  QtMacExtras: http://qt.gitorious.org/qtplayground/qtmacextras
+
+
 Qt for Linux/X11
 ----------------
 
@@ -849,6 +854,35 @@ Qt for Windows
 
 Qt for Mac OS X
 ---------------
+* Qt now uses Cocoa, the Carbon port has been removed.
+* The minimum supported OS X version is 10.6. PPC is not supported.
+* Qt generally supports cross OS X version build and deployment (build
+  on any supported version and deploy to any other). One exception is
+  QtWebkit, which should be built using the 10.6 SDK if you want to target
+  that platform.
+* The Qt binary installer has been changed to use the Qt installer framework.
+  Qt is now installed into one location instead of being spread out over multiple
+  directories.
+* The Qt binary installer is built against the 10.7 SDK and does not
+  run on 10.6.
+* The Clang compiler is used by default. Gcc is available trough the
+  macx-g++* mkspecs.
+* Build-system support for universal binaries has been removed. The "lipo"
+  command-line tool can be used as a workaround.
+* Qt now use the raster paint engine on all platforms for drawing widgets.
+  CoreGraphics is still used for printing on Mac.
+* Support for high-dpi "retina" displays has been added for widgets,
+  OpenGL and QtQuick.
+* The unified toolbar implementation from Qt 4 has not and will not be ported
+  to Qt 5. This means calling QMainWindow::setUnifiedTitleAndToolBarOnMac has
+  no effect on Qt 5. A replacement API which wraps NSToolbar is available in
+  QtMacExtras.
+* MacDeployQt plugin deployment has been improved. It will no longer try to
+  deploy all plugins with all dependencies.
+* Qt has been updated to be in compliance with the Mac App Store sandbox, and
+  will for example no longer try to write settings to files outside the sandbox.
+* The "qt_menu.nib" issue preventing static/non-framework builds from working
+  has been fixed.
 
 
 Qt for Embedded Linux
@@ -870,9 +904,66 @@ Qt for Windows CE
 
 - Build System
 
-  * Remove qttest_p4.prf file. From now on we should explicitly enable the
-    things from it which we want. Autotest .pro files should stop using
-    'load(qttest_p4)' and start using 'CONFIG+=testcase' instead.
+  * Qt has been split into numerous repositories. Configure covers mostly only qtbase's options.
+  * Qt will now install CMake configuration files for all its libraries.
+
+- configure
+
+  * The Mac OS X -dwarf2 configure argument has been removed. DWARF2 is always
+    used on Mac OS X now.
+  * The following options have been added: (-no)-force-asserts, (-no)-strip, (-no)-gui &
+    (-no)-widgets, -device & -device-option, -archdatadir, -libexecdir & -qmldir,
+    and numerous changes relating to specific Qt features and dependencies.
+  * Configure will no longer call "qmake -recursive" by default, as the subsequent
+    build invokes qmake as needed. Use -fully-process to restore the old behavior.
+
+- qmake
+
+  * default_pre.prf is now evaluated per subproject & build pass, symmetrically
+    to default_post.prf.
+  * .qmake.conf files (.qmake.cache equivalent in source tree) are read now.
+  * Project-specific mkspecs/ and features/ directories are supported now.
+    QMAKEPATH and QMAKEFEATURES can be set in .qmake.{config,cache} to specifiy their
+    location, and qmake will find them in the project's top-level directory automatically.
+  * Mixing host and target subprojects is now supported. "default-host" makespec
+    was added; option(host_build) enables its use.
+  * QMAKE_MOC_OPTIONS variable is now available for passing additional parameters
+    to the moc.
+  * The CROSS_COMPILE variable and property can be used to parametrize the device
+    and mingw makespecs.
+  * QMAKE_RPATHLINKDIR (complementary to QMAKE_RPATHDIR) is now understood.
+  * The "aux" TEMPLATE was added. Does not work with vcproj and xcode output files.
+  * The properties QT_INSTALL_ARCHDATA, QT_INSTALL_LIBEXECS, QT_INSTALL_QML,
+    QMAKE_SPEC & QMAKE_XSPEC were added. QT_INSTALL_DEMOS is obsolete.
+  * The following functions have been added: $$sort_depends, $$resolve_depends,
+    $$enumerate_vars, $$reverse, $$val_escape, $$format_number, $$shadowed,
+    $$clean_path, $$system_path, $$shell_path, $$absolute_path, $$relative_path,
+    $$system_quote, $$shell_quote, cache, write_file, touch, mkpath & log.
+    defined can now query variables; $$cat and $$system support more splitting modes.
+    qtCompileTest (available from configure.prf) was added.
+  * Removed qttest_p4.prf. Use CONFIG+=testcase and other flags instead.
+  * QMAKE_SUBSTITUTES can now copy files verbatim.
+  * MSVC desktop builds now use -Zc:wchar_t.
+  * The following variables were added: QMAKESPEC, _QMAKE_CONF_ & _QMAKE_SUPER_CACHE_.
+  * QDBUSXML2CPP_{INTERFACES,ADAPTORS}_{HEADER,SOURCE}_FLAGS are now understood,
+    and DBUS_{INTERFACES,ADAPTORS} support file groups with individual flags now.
+  * QT_PRIVATE and PKGCONFIG_PRIVATE (analogous to LIBS_PRIVATE resp. PKGCONFIG) are now understood.
+  * INSTALLS entries now support copying with subdirectory (e.g., entry.base = $$dirname(PWD)).
+  * Defining QTPLUGIN in dynamically linked projects does not hurt any more.
+  * CONFIG+=import_plugins will now cause plugin imports for QTPLUGIN being auto-generated.
+  * Debug info generation can now be enabled also for release builds (CONFIG+=force_debug_info).
+  * The following CONFIG flags have been deprecated in favor of QT module entries:
+    qtestlib, qdbus, help, designer, uitools, qaxserver & qaxcontainer (the leading 'q'
+    was stripped from the affected modules).
+  * The IN_PWD alias for PWD was deprecated.
+  * QMAKE_{DIST,}CLEAN support normalized path separators now.
+  * CONFIG+=depend_includepath is on by default now. DEPENDPATH is unnecessary in most projects.
+  * Makespecs should be adjusted in the following ways:
+    * The QMAKE_INCDIR_QT, QMAKE_LIBDIR_QT, QMAKE_MOC, QMAKE_UIC, QMAKE_IDC, TEMPLATE & QT
+      variables should not be defined any more. Furthermore, QMAKE_LIBS_X11SM is obsolete.
+    * The qt, warn_on, release, & link_prl CONFIG flags should not be set any more.
+    * The QMAKE_PLATFORM & QMAKE_COMPILER variables should be defined now.
+      Several other variables should be defined by including files from mkspecs/common/.
 
 - Assistant
 
@@ -883,6 +974,11 @@ Qt for Windows CE
 
 - Linguist
 
+  * The integration with Mac OS' document handling was improved
+  * lupdate can now treat other .ts files as sources
+  * lupdate's CODECFORTR is deprecated and will be removed soon. All source code
+    written with Qt is expected to use UTF-8 encoding.
+
 - rcc
 
 
@@ -895,20 +991,6 @@ Qt for Windows CE
 - uic
 
 
-- uic3
-
-
-- qmake
-
-* QMAKE_MOC_OPTIONS variable is now available for passing additional parameters
-  to the moc.
-
-
-- configure
-
-  * The Mac OS X -dwarf2 configure argument has been removed. DWARF2 is always
-    used on Mac OS X now.
-
 - qtconfig
 
 
@@ -957,6 +1039,10 @@ Qt for Windows CE
     in the URL by themselves. Now, it will return "%25", like
     QUrl::toEncoded().
 
+- QLibraryInfo
+
+  * location() always returns paths with normalized separators now.
+
 - QVariant
 
   * Definition of QVariant::UserType changed. Currently it is the same as
@@ -977,9 +1063,59 @@ Qt for Windows CE
     Please, notice that QMetaType::UnknownType has value 0, which previously was
     reserved for QMetaType::Void.
 
+- QWidget
+
+  * No need to set the application name in setWindowTitle() anymore, this is done
+    automatically, on Windows and Unix/X11, provided that the (possibly translated)
+    application display name is set with QGuiApplication::setApplicationDisplayName().
 
 - QMessageBox
 
      * The static function QMessageBox::question has changed the default argument
      for buttons. Before the default was to have an Ok button. That is changed
      to having a yes and a no button.
+
+- qmake & configure
+
+  * The project file parser has been rewritten from scratch. Invalid syntax will be
+    rejected more aggressively, and interpretation may have changed in some corner cases.
+  * Projects which explicitly set an empty TARGET are considered broken now.
+  * The makespec and .qmake.cache do not see build pass specific variables any more.
+  * load()/include() with a target namespace and infile()/$$fromfile() now start with
+    an entirely pristine context.
+  * Configure's -sysroot and -hostprefix are now handled slightly differently.
+    The QT_INSTALL_... properties are now automatically prefixed with the sysroot;
+    the raw values are available as QT_INSTALL_.../raw and the sysroot as QT_SYSROOT.
+    The new QT_HOST_... properties can be used to refer to the Qt host tools.
+    -no-gcc-sysroot can be used for non-standard sysroot configurations.
+  * The QMAKE_MKSPECS property became unavailable at the command line. Query QT_HOST_DATA instead.
+  * The TEMPLATE_PREFIX variable is gone. Use contains(TEMPLATE, vc.*) instead.
+  * The "default" makespec symlink/directory is gone. Use qmake -query QMAKE_XSPEC instead.
+  * DEPENDPATH does not end up in VPATH any more. Some SOURCES may not be found any more.
+  * Several functions and built-in variables were modified to return normalized paths.
+  * The -(no-)exception flags in configure have been removed. Qt modules are now compiled
+    without exceptions by default, as they do not use them and can neither handle them
+    properly. Qt Core still has exceptions enabled to correctly throw bad_alloc exceptions
+    in our tool classes.
+    Whether code should be compiled with exception support enabled or disabled can be
+    controlled by a CONFIG += exceptions/exceptions_off setting in the .pro file.
+  * The -no/-stl configure options are gone. Qt always uses the STL now.
+  * The -no/-fast configure options are gone.
+  * The -prefix-install configure option is gone. Use -prefix, etc. instead.
+  * The -make option of the Windows configure was renamed to -make-tool.
+    -make now complements -no-make, like in the Unix version.
+  * The object_with_source CONFIG flag was removed. Use object_parallel_to_source instead.
+  * Support for universal binaries on Mac OS has been removed.
+  * The processor architecture handling changed significantly. This affects the -arch & -*-endian
+    configure options, the QT_ARCH qmake variable, and more.
+  * No "make_default" make targets will be generated any more. Use "make_first" instead.
+  * The "qmake" make targets are non-recursive now. Use "qmake_all" to recurse.
+  * load() with paths relative to the current project is not supported any more.
+    Use include() instead.
+  * Persistent qmake properties are not versioned any more. Also, the vendor changed to
+    "QtProject", so old settings are lost.
+  * Support for the Borland toolchain was removed. Numerous obsolete makespecs were culled.
+  * setcepaths.bat is gone. QMake-generated Makefiles are self-contained now.
+  * moc_dir, rcc_dir and some other tool variables are not defined in Qt's .pc files any more;
+    the generic host_bins is defined instead.
+
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
new file mode 100644
index 0000000000..479ac344ce
--- /dev/null
+++ b/dist/changes-5.0.1
@@ -0,0 +1,115 @@
+Qt 5.0.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+Legal
+-----
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+QtCore
+-----
+
+QtGui
+-----
+
+QtWidgets
+---------
+
+QtNetwork
+---------
+
+QtDBus
+------
+
+QtConcurrent
+------------
+
+QtOpenGL
+--------
+
+QtScript
+--------
+
+QTestLib
+--------
+
+QtSql
+-----
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+sqlite
+------
+
+postgres
+--------
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Linux/X11
+----------------
+
+Qt for Windows
+--------------
+
+Qt for Mac OS X
+---------------
+
+Qt for Embedded Linux
+---------------------
+
+Qt for Windows CE
+-----------------
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+