Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/sql/drivers/sqlite/qsql_sqlite.cpp

Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd

config.tests/unix/posix_fallocate/posix_fallocate.cpp

@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <fcntl.h>
+
+int main(int, char **)
+{
+    return ::posix_fallocate(0, 0, 0);
+}

config.tests/unix/posix_fallocate/posix_fallocate.pro

@@ -0,0 +1,2 @@
+SOURCES = posix_fallocate.cpp
+CONFIG -= qt dylib

configure

@@ -687,6 +687,7 @@ CFG_MIPS_DSP=auto
 CFG_MIPS_DSPR2=auto
 CFG_CLOCK_GETTIME=auto
 CFG_CLOCK_MONOTONIC=auto
+CFG_POSIX_FALLOCATE=auto
 CFG_MREMAP=auto
 CFG_GETADDRINFO=auto
 CFG_IPV6IFNAME=auto
@@ -5143,6 +5144,9 @@ if [ "$CFG_XCB" != "no" ]; then
         if [ "$CFG_XCB_XLIB" != "no" ]; then
             if compileTest qpa/xcb-xlib "xcb-xlib" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then
                 QT_CONFIG="$QT_CONFIG xcb-xlib"
+                CFG_XCB_XLIB=yes
+            else
+                CFG_XCB_XLIB=no
             fi
         fi
 
@@ -5457,6 +5461,15 @@ elif [ "$CFG_CLOCK_GETTIME" = "no" ]; then
     CFG_CLOCK_MONOTONIC=no
 fi
 
+# detect posix_fallocate
+if [ "$CFG_POSIX_FALLOCATE" = "auto" ]; then
+    if compileTest unix/posix_fallocate "posix_fallocate"; then
+        CFG_POSIX_FALLOCATE=yes
+    else
+        CFG_POSIX_FALLOCATE=no
+    fi
+fi
+
 # detect mremap
 if [ "$CFG_MREMAP" = "auto" ]; then
     if compileTest unix/mremap "mremap"; then
@@ -5781,6 +5794,9 @@ fi
 if [ "$CFG_CLOCK_MONOTONIC" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG clock-monotonic"
 fi
+if [ "$CFG_POSIX_FALLOCATE" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG posix_fallocate"
+fi
 if [ "$CFG_MREMAP" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG mremap"
 fi
@@ -6260,6 +6276,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
 [ "$CFG_GLIB" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB"
 [ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK"
 [ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC"
+[ "$CFG_POSIX_FALLOCATE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_POSIX_FALLOCATE"
 [ "$CFG_MREMAP" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP"
 [ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO"
 [ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME"

dist/changes-5.2.0

@@ -48,6 +48,10 @@ information about a particular change.
    * QUrl now normalizes the path given in setPath, removing ./ and ../ and
      duplicate slashes.
 
+ - QWheelEvent has gained a "phase" attribute and may now be sent with
+   zero delta() in order to indicate beginning and end of transient
+   scrolling.
+
 ****************************************************************************
 *                          Library                                         *
 ****************************************************************************
@@ -290,6 +294,9 @@ QtGui
  - [QTBUG-27349] Reintroduced command line argument for positioning
    windows (-geometry on X11, -qwindowgeometry on other platforms)
 
+ - [QTBUG-28832] Fixed regression from Qt 4 when using
+   QTextOption::ShowLineAndParagraphSeparators.
+
 QtNetwork
 ---------
 
@@ -353,12 +360,24 @@ Changes in Qt 5.2.0
 QtWidgets
 ---------
 
+ - Added class QKeySequenceEdit.
+ - Added QMaxCocoaViewContainer and QMacNativeWidget classes.
+ - [QTBUG-1016] Added API to control tool tip timing via:
+   * new QToolTip::showTip() overload
+   * QWidget::toolTipDuration() property.
+   * QStyle::SH_ToolTip_WakeUpDelay and SH_ToolTip_FallAsleepDelay
+     style hints.
  - [QTBUG-30255] Fixed a bug where spans across empty cells in a grid
    layout got broken.
+ - [QTBUG-31569] WA_QuitOnClose now works even if there are other
+   windows that don't have it set.
  - [QTBUG-32788] Properly handles Qt::WidgetWithChildrenShortcut
    shortcuts in MDI subwindows now.
  - [QTBUG-33078] QWidget::setWindowOpacity() now works when called
    before QWidget::show().
+ - [QTBUG-33104] Fixed a bug where layout items with a Preferred size
+   policy would be treated as fixed size, if mixed with Expanding
+   items having maximumSize set.
  - [QTBUG-33247] Changed accessible trees and tables to always expose
    hidden headers, instead of only exposing the visible headers.
  - [QTBUG-34007] Fixed a crash in tablet support.
@@ -384,18 +403,26 @@ QtWidgets
      overriding viewportSizeHint() needs to be recompiled against 5.2 for
      this feature to work correctly.
 
+ - QButtonGroup:
+   * [QTBUG-14857] Added buttonToggled() signals.
+
  - QColorDialog:
    * Added a web color QLineEdit.
    * [QTBUG-14332] Added a screen color picker button.
    * [QTBUG-31998] Does no longer create widgets when using the
      platform dialog.
+   * [QTBUG-32054] Fixed a bug with keyboard navigation.
 
  - QComboBox:
+   * [QTBUG-31146] Fixed selection of items with identical text in
+     popup completion.
    * Added currentData() convenience function which allows to retrieve
      the user data set for the current item.
 
  - QCompleter:
    * [QTBUG-3414] Added filterMode property.
+   * The activated() signal now passes invalid indexes instead of
+     random bogus ones when falling back to the completion prefix.
 
  - QDesktopWidget:
    * [QTBUG-32567] Fixed emission of workAreaResized() signal.
@@ -434,10 +461,16 @@ QtWidgets
    * [QTBUG-33039] Does no longer create widgets when using the
      platform dialog.
 
+ - QFontComboBox:
+   * [QTBUG-1573] Made QFontComboBox locale-sensitive.
+
  - QFontDialog:
    * Now has finer-grained control over the types of fonts listed,
      similar to what QFontComboBox already had.
 
+ - QGestureManager
+   * Now supports Mac OS X native gestures.
+
  - QGraphicsView etc
    * Fixed a crash in QGraphicsProxyWidget.
    * [QTBUG-8061] Allow handling of mouseDoubleClickEvent in
@@ -446,16 +479,30 @@ QtWidgets
      Qt::{Contains,Intersets}ItemBoundingRect with items that contain
      the point in the bounding rectangle, but not their (custom)
      shape.
+   * [QTBUG-29945] Fixed drop-shadow and blur effects when using a
+     QGLWidget viewport.
+
+ - QGroupBox:
+   * [QTBUG-33610] The check indicator of a checkable group box is no
+     longer clipped when using a small title font.
 
  - QHeaderView:
+   * Reduced memory usage by 33%.
    * [QTBUG-4346] A maximumSize for sections has been introduced. The
      maximum section size is by default the largest possible section
      size which in Qt 5.2 has been limited to 1048575 pixels.
+   * [QTBUG-32203] Fixed a painting bug involving hidden and reordered
+     sections.
 
  - QInputDialog:
    * Added getMultiLineText static method.
 
+ - QLayout:
+   * Added replaceWidget() function.
+
  - QLineEdit:
+   * [QTBUG-32061] The cursor is now positioned correctly in an empty
+     line edit with placeholder text.
    * Keep placeholderText visible when focused, until text is added.
    * Context-menu actions now have icons.
    * Made it possible to add side widgets.
@@ -467,28 +514,59 @@ QtWidgets
      no longer loses the icon. Also fixed a bug where under certain
      conditions code overriding QAbstractItemView::viewOptions() would
      not be called.
+   * [QTBUG-21433] Fixed content size calculation when either
+     horizontal or vertical scroll bar policy is always off.
+
+ - QMacStyle:
+   * [QTBUG-31668] Fixed a case where multiple auto-default button
+     animations were running in parallel on OS X
+
+ - QMainWindow:
+   * Added takeCentalWidget() function.
+
+ - QMenu:
+   * Added QMenu::toNSMenu() conversion function (Mac only)
+   * Added QMenu::setAsDockMenu() and qt_mac_set_doc_menu(QMenu *menu)
+     functions (Mac only).
+   * [QTBUG-31664] Moving the mouse over a menu separator now closes
+     any open sub menus.
 
  - QMenuBar:
    * [QTBUG-32807] Menus now close again on second click.
+   * Added QMenuBar::toNSMenu() conversion function (Mac only)
 
  - QMessageBox:
    * May use native message boxes on some platforms now.
+   * setDetailedText() now works after show().
+   * [QTBUG-2450] Added setCheckBox() function.
    * [QTBUG-6731] It is now possible to select some or all text from a
      QMessageBox and copy it to the clipboard.
 
+ - QScrollBar:
+   * Transient scrollbars are now properly shown when starting
+     two-finger scrolling on OS X.
+
  - QSizePolicy:
    * Added a retainSizeWhenHidden attribute.
 
  - QSpinBox:
    * Values can now be displayed in different bases
      (cf. displayIntegerBase property)
-   * [QTBUG-31602] Size calculation will now be fixed when stylesheets
-     are used.
+   * [QTBUG-31602][QTBUG-34305] Fixed size calculation when
+     stylesheets are used.
+
+ - QSplashScreen:
+   * Added message(), a getter for the currently displayed message.
 
  - QSplitter:
    * Now gets the default value of opaqueResize property from (new)
      QStyle::SH_Splitter_OpaqueResize styleHint.
 
+ - QStyle:
+   * Added SH_ToolTip_WakeUpDelay and SH_ToolTip_FallAsleepDelay.
+   * Fixed SH_ItemView_ActivateItemOnSingleClick not being retrieved
+     correctly from the platform theme.
+
  - QSystemTrayIcon:
    * [QTBUG-31762] Fixed position of system tray icon on Linux/X11
      (except Unity).
@@ -505,14 +583,26 @@ QtWidgets
    * Added placeholderText akin to QLineEdit.
    * Context-menu actions now have icons.
 
+ - QToolTip:
+   * Added new showText() overload taking a duration.
+
  - QTreeView:
-   * QTreeView now has setTreePosition to allow the treestructure to
-     show data from other columns than logicalindex zero.
+   * Added setTreePosition() function.
+
+ - QWidget:
+   * Added window{Title,Icon,IconText}Changed() signals.
+   * Added toolTipDuration property.
 
  - QWindowContainer:
    * [QTBUG-32177] Sets active window correctly now.
+   * [QTBUG-34138] Will not create native child widgets any more.
+
+ - QWindowsVistaStyle:
+   * [QTBUG-26503] Does no longer draw inapplicable scroll bar
+     grippers on Windows 8.
 
  - QWizard:
+   * [QTBUG-26722] The default background pixmap works again on OS X.
    * [QTBUG-29924] Gave all buttons an objectName().
 
 ****************************************************************************
@@ -533,10 +623,45 @@ Android
    show the status bar (QWindow::showMaximized()). Use
    QWindow::showFullScreen() to hide it.
  - Implemented support for accessibility on Android.
+ - Implemented support for native action bar backend for menu bars in
+   Qt Quick Controls and Qt Widgets.
+ - Implemented support for native popup menus and comboboxes in Qt Quick
+   Controls.
+ - Implemented support for native message boxes in Qt Widgets.
+ - Several improvements to handling dialogs and multiple top-level
+   windows in Qt Widgets.
+ - Implemented automatic inclusion of necessary permissions in manifest
+   when linking against Qt Multimedia.
+ - Fixed crash on startup when running on Android 4.4.
+ - Add requirement for Android SDK version 13 or higher for building
+   Qt application. Note that this is for building only. The application
+   can still be targeted for devices with SDK versions 9 and up.
+ - Default to target SDK version 14 to disable overflow button in
+   system navigation.
+ - New module: Qt Android Extras. Contains convenience APIs for using
+   JNI, and will in the future include support for Android-specific
+   features which do not fit in a cross-platform API.
+ - Implemented support for thread-affinity in qrand() functions.
+ - Fixed several problems with predictive text in soft keyboard.
+ - Made several improvements to stability.
+ - Implemented support for camera and low-latency audio in Qt Multimedia.
+ - Fixed driver-specific bugs in text rendering in Qt Quick 2.
+ - Added preference in default manifest for installing applications to
+   external storage if possible.
+ - Fixed delivery of key press event for the Back key.
+ - Fixed race condition when showing a window in full screen which would
+   cause it to not be maximized.
+ - Fixed input method hints.
+ - Made font point sizes compatible with the interpretation of point
+   sizes on iOS to ease sharing code between the two platforms.
+ - Added support for QAmbientTemperatureSensor, QPressureSensor
+   and QProximitySensor to Qt Sensors.
+ - Removed dependency on Qt Widgets in default build of Qt Quick Controls.
 
 OS X
 ----
 
+ - Added QMaxCocoaViewContainer and QMacNativeWidget classes.
  - Qt for OS X is now identified by the macro Q_OS_OSX. This complements the
    existing Q_OS_DARWIN macro (which identifies the open source kernel and
    could identify non-Apple products) and Q_OS_MAC, which is defined for
@@ -547,6 +672,17 @@ OS X
    supported until official announcement by the Qt Project.
  - Added a number of functions to QtCore to convert to and from
    CFString/NSString and QString, CFURL/NSURL and QUrl.
+ - QGestureManager now supports Mac OS X native gestures.
+ - Added QMenu::setAsDockMenu(), QMenu(Bar)::toNSMenu(),
+   qt_mac_set_doc_menu() functions.
+ - [QTBUG-26722] The QWizard default background pixmap works again.
+
+BlackBerry
+----------
+
+ - Cover windows (aka active frames) are now supported. Cover windows must
+   have the Qt::CoverWindow flag set. They are shown when the application
+   is minimized.
 
 Windows
 -------

doc/src/examples/books.qdoc → examples/sql/doc/src/books.qdoc

@@ -28,6 +28,8 @@
 /*!
     \example books
     \title Books
+    \ingroup sql_examples
+    \brief Shows how to use Qt SQL classes with a model/view framework.
 
     The Books example shows how Qt's SQL classes can be used with the model/view
     framework to create rich user interfaces for information stored in a database.

mkspecs/common/winrt_winphone/qmake.conf

@@ -64,7 +64,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO /DYNAMICBASE /NXCOMPAT /NODEFAULTLIB:ole32.lib
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF /INCREMENTAL:NO
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS
 QMAKE_LFLAGS_EXE        = /MANIFEST:NO