Merge commit 'origin/4.5'

Conflicts:
	src/3rdparty/phonon/qt7/mediaobject.mm
	src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
	src/gui/text/qfontengine_win.cpp
	tools/linguist/shared/cpp.cpp

1 files changed, 79 insertions, 2 deletions

diff --git a/dist/changes-4.5.2 b/dist/changes-4.5.2
index 04a29ba..6049a4d 100644
--- a/dist/changes-4.5.2
+++ b/dist/changes-4.5.2
@@ -59,6 +59,10 @@ Third party components
 - QAbstractNetworkCache
    * Only cache responses to HTTP GET by default, not HTTP PUT or POST
 
+- QApplication
+   * [249589] Fixed bug that prevented any part of the application to receive
+     focus when Graphics View was disabled using QT_NO_GRAPHICSVIEW.
+
 - QComboBox
    * [253944] Changing the style doesn't reset custom item delegate anymore.
    * [254589] Fixed the frame appearing if setting a stylesheet with a border
@@ -67,6 +71,17 @@ Third party components
 - QDir
    * Fix reentrency (listing directories in different threads)
 
+- QFileSystemModel
+   * [254701] QFileSystemModel doesn't sort subfolders when using it in a QTreeView
+   * [251295] Windows path names incorrectly constructed in calls to updateIcon()
+
+- QFileDialog
+   * [251341] It is not possible to remove a directory of the sidebar if the directory does not exist
+   * [251321] Hidden path in QFileDialog's sidebar cannot be opened
+   * [226483] setSidebarUrls() handles the urls case sensitive so that adding the same directory twice is possible - Windows
+   * [252068] QFileDialog with QSortFilterProxyModel crashes
+   * [254490] QFileDialog selectFile doesn't clear the selection if we call it several times.
+
 - QMacStyle
     * [253339] Don't draw arrows on toolbuttons that have a menu and text only.
     * [252301] Ensure that small and mini spin boxes are drawn correctly.
@@ -77,6 +92,9 @@ Third party components
 - QFontDialog
     * [252000] Ensure that QFontDialog::getFont() works on Mac OS X.
 
+- QGraphicsWidget
+    * Fixed a bug with Qt::WidgetWithChildren shortcut context.
+
 - QLocalSocket
    * [247144] correctly handle remote disconnects
 
@@ -96,6 +114,10 @@ Third party components
     * [253448] Prevent a crash when using the Qt::WA_MacBrushedMetal attribute
       in conjunction with style sheets.
 
+- QWizard
+    * [252662] Fixed crash that could happen when compiling on Windows XP and
+      running on older Windows versions like 98 and 2000.
+
 - QObject
     * Fixed possible race condition if two QObject connected together with
       signals and slot are destroyed in different threads
@@ -109,6 +131,11 @@ Third party components
     * Fixed crash when drawing on a null pixmap.
     * [251534] Fixed issue where text with non-opaque color from widget
       palette would be blitted instead of blended.
+    * [253663] Fixed an issue with implicitly closed poly lines when using
+      perspective transforms.
+
+- QProgressBar
+    * [252283] Fixed busy indicator for a QProgressBar with a style sheet applied to it.
 
 - QSelectionModel
    * [252069] fix QSelectionModel::rowIntersectsSelection or QSelectionModel::columnsIntersectsSelection not reporting right result if some items are disabled.
@@ -124,6 +151,10 @@ Third party components
 - QString
     * Fixed reentrency of QString::squeeze()
 
+- QTabBar
+    * [252472] Fixed problem with the current tab not being visible after calling
+      setTabButton() on a scrolled tab bar.
+
 - QTransform
     * Fixed issue in QTransform::type() causing a projective transform to be
     treated as a scaling transform.
@@ -136,6 +167,8 @@ Third party components
       engine.
     * [251485] Fixed crash that could occur with projective transforms and
       high quality antialiasing.
+    * [253468] Fixed a crash in the GL 2 paint engine that could occur
+      when drawing text.
 
 - QCssParser
     * [252311] "font-family:" now handle fallback font specified with a comas
@@ -157,6 +190,28 @@ Third party components
 
 - QPrintDialog
     * [253135] Crash in QPrintDialog when editing output filename
+    * [252873] Fixed an issue that could cause QPrintDialog to invalidate
+      a valid QPrinter object.
+    * [224728] Fixed an issue under X11 where QPrintDialog didn't update
+      the print-to-file state, if it was passed a QPrinter set up to
+      print PDF or PostScript.
+
+- QPrinter
+    * [252873] Fixed an issue with QPrinter::NativeFormat printers not
+      being valid.
+    * [248881] Fixed an issue under Windows where QPrinter::pageRect() returned
+      the wrong rect when QPrinter::fullPage() was set.
+    * [199271] Fixed an issue with QPrinter::setPrinterName()/printerName()
+      on Mac.
+
+- QSvg
+    * [253614] Fixed an issue with parsing the 'stroke-dasharray' SVG attribute.
+
+- QSvgIconEngine
+    * [251106] Fixed an issue that would cause QIcon::actualSize() to reparse
+      the SVG file for each acutalSize() call, until QIcon::pixmap() was called.
+    * [248848] Fixed an issue that would cause QIcon::pixmap() to reparse the
+      SVG file, even though there was a cached pixmap for that size available.
 
 ****************************************************************************
 *                          Database Drivers                                *
@@ -173,17 +228,30 @@ Qt for Linux/X11
 legacy freetype headers.
 [241361] Prevented asynchronous access to non-thread safe libfontconfig API.
 [244362] Worked around X server crash when calling XFillPolygon with more than
-200000 points by falling back to raster paint engine.
+	 200000 points by falling back to raster paint engine.
 [250326] Titlebar wasn't shown on X11 with Qt::CustomizeWindowHint for
 	 fixed-size windows.
 [251925] Improved showing QMessageBox on small screens.
 [252042] Fixed the loading of the OpenSSL libraries on OpenBSD.
+[255311] Fixed an issue with '-graphicssystem raster' on 8 and 16 bit X servers.
+[252328] Fixed an issue when rendering old XLFD fonts on X11 with Xrender and
+	 fontconfig enabled.
+[248720] Fixed an issue with using '-graphicssystem raster' on X servers with
+         BGR color layout.
+[196152] Fixed a problem with QPixmap::toImage() on big endian systems that
+         would cause the R and B channels to be swapped for 32 bit pixmaps.
 
 Qt for Windows
 --------------
 
+Fixed an issue with text rendering in 16 bit mode.
+
+[246196] Fixed an issue with clipped glyphs when rendering text with
+         certain fonts.
 [251259] Switching to another app left text cursor in line edits with
 	 QtMfc framework.
+[253367] Fixed a memory leak when loading system icons on Windows.
+
 
 Qt for Mac OS X
 ---------------
@@ -191,6 +259,9 @@ Qt for Mac OS X
 [252176] Fix regression in drawing parts of pixmaps on Panther.
 [253402] Fix a crash when a Cocoa window that used to be a QWidget would get events
          after the QWidget was destroyed.
+[249178] Fixed an issue with drawing text to QImages on Mac/Cocoa.
+[250066] Fixed an issue that caused reparenting of QGLWidgets to output warnings
+         on Mac/Cocoa.
 
 
 Qt for Embedded Linux
@@ -199,7 +270,9 @@ Qt for Embedded Linux
 
 Qt for Windows CE
 -----------------
-[248846] handle the back soft key on Windows mobile.
+[248846] Handle the back soft key on Windows mobile.
+[252319] Fix regression in native menu integration.
+[242484] Fixed crash if Qt::WindowCancelButtonHint is used for a QDialog
 
 
 ****************************************************************************
@@ -231,6 +304,10 @@ Qt for Windows CE
      QDesignerFormWindowCursor::setProperty().
    * [253539] Prevent crash in Designer with the Cocoa port when when using a scroll
      wheel to change a property.
+   * [252333] Fixed a regression crash in uic triggered when icon was set with different modes
+     than normal off.
+   * [252414, 252416, 252502] Fixed a crash in case of setting invalid point size
+     of font property in property editor
 
 - Linguist
   - Linguist GUI