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

Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
boris-fx · Feb 14, 2013 · e65cd6f · e65cd6f
2 parents d1ee718 + e95a758
commit e65cd6f
Show file tree

Hide file tree

Showing 383 changed files with 28,309 additions and 2,767 deletions.
diff --git a/bin/syncqt b/bin/syncqt
@@ -195,12 +195,6 @@ sub classNames {
             chomp $line;
                         chop $line if ($line =~ /\r$/);
             if($line =~ /^\#/) {
-                if($line =~ /\\$/) {
-                    while($line = <F>) {
-                        chomp $line;
-                        last unless($line =~ /\\$/);
-                    }
-                }
                 return @ret if($line =~ m/^#pragma qt_sync_stop_processing/);
                 push(@ret, $1) if($line =~ m/^#pragma qt_class\(([^)]*)\)[\r\n]*$/);
                 $line = 0;

diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
@@ -40,37 +40,66 @@ Legal
 *                          Library                                         *
 ****************************************************************************
 
-
 QtCore
 -----
 
+ - Fix QMutex::tryLock with negative values
+ - Fix a leak in case the QMetaObject::Connection survives the sender object,
+   after a successful disconnect().
+ - Speed up and fix QByteArray::setNum()
+ - [QTBUG-28924] Don't increase the reference count if dynamic_cast failed
+
 QtGui
 -----
 
+ - Fix QGuiApplication::keyboardModifiers() and QGuiApplication::mouseButtons()
+ - Fix styleName support in QPA font database
+ - Make QImage::mirrored() propagate devicePixelRatio
+ - [QTBUG-28324] Fixed invalid memory read in SSSE3 image blending code.
+
 QtWidgets
 ---------
 
+ - Do not inform that a widget is not visible when it's disabled.
+ - [QTBUG-28031, QTBUG-2596] QMenu: Do not set snapToMouse if a caused-widget exists.
+ - [QTBUG-28321] Fix focusproxy-relayed crash in QGraphicsItem destructor.
+ - [QTBUG-28446] Fix compilation when Q_NO_USING_KEYWORD is defined
+ - [QTBUG-28477] Fix QWidget::setWindowOpacity() when called before show().
+ - [QTBUG-28506] Style animations: fix QCommonStylePrivate::stopAnimation()
+ - [QTBUG-28557] Fix QGtkPainter::reset() to reset the clip rect
+
 QtNetwork
 ---------
 
+ - [QTBUG-28937] SSL certificates: blacklist mis-issued Turktrust certificates
+
 QtDBus
 ------
 
+ - qdbusxml2cpp: Check string length before checking for \r\n.
+
 QtConcurrent
 ------------
 
 QtOpenGL
 --------
 
-QtScript
---------
+ - Fix compilation of Open GL ES 2 examples when using a Qt-namespace.
+ - Fixed deadlock situation in QtOpenGL's texture management.
+ - updating qeglfshooks_imx6.cpp to 12.09.01 (L3.0.35) opengl-drivers
+ - [QTBUG-27512] Entered hardcoded urls for <OpenGL> and <Khronos O.GL>
+ - [QTBUG-28875] Fix bug in multisampling handling when converting from surface format
 
 QTestLib
 --------
 
+ - Add qtest_widget.h to the list of testlib headers
+
 QtSql
 -----
 
+ - Fix QSqlQuery test in relation to PSQL support
+
 ****************************************************************************
 *                          Database Drivers                                *
 ****************************************************************************
@@ -81,26 +110,53 @@ sqlite
 postgres
 --------
 
+ - Use PG_VERSION if PG_MAJORVERSION is not defined
+
 ****************************************************************************
 *                      Platform Specific Changes                           *
 ****************************************************************************
 
 Qt for Linux/X11
 ----------------
 
+ - XCB: add support for getting and setting appTime and appUserTime.
+ - [QTBUG-28561] Fixed incorrect handling of extra mouse buttons in XCB platform plugin.
+
 Qt for Windows
 --------------
 
+ - DBUS: Fix linker errors on Windows.
+ - Define Q_COMPILER_AUTO_FUNCTION for MVSC
+ - [QTBUG-28611] Fix warnings about not being able to set Window geometry on Windows.
+ - [QTBUG-28611] QMdiArea: Increase minimum size for Windows 8/Large fonts.
+ - [QTBUG-28645] Rename conflicting symbol QVariantToVARIANT
+ - [QTBUG-28876] QWindowsVistaStyle: fix frame rendering
+
 Qt for Mac OS X
 ---------------
 
+ - Ignore ScrollBarAlwaysOn policy for transient scrollbars
+ - New rendering for disclose triangle, get proper color when selected
+ - [QTBUG-27415] Fix bugs for font selection in QFontDialog
+ - [QTBUG-28161] Ensure the native filedialog starts up with the right directory
+ - [QTBUG-28443] Cocoa: Re-enable per class palette on QPA plugin
+ - [QTBUG-28669] Fix transient QScrollBar flashing
+ - [QTBUG-28738] Bring back proper layout in QMessageBox
+
+Qt for BlackBerry
+-----------------
+
+ - Reset virtual keyboard when shown.
+ - Disable Q_COMPILER_RVALUE_REFS on QNX
+ - Fix QNX QPA plugin clipboard impl
+ - Don't crash because the window hasn't been initialized yet.
+
 Qt for Embedded Linux
 ---------------------
 
 Qt for Windows CE
 -----------------
 
-
 ****************************************************************************
 *                      Compiler Specific Changes                           *
 ****************************************************************************
@@ -111,11 +167,41 @@ Qt for Windows CE
 *                          Tools                                           *
 ****************************************************************************
 
+configure
+---------
+
+ - Remove the -fast configure option as it was pretty much broken
+ - [QTBUG-23569, QTBUG-25760] Check for gtk_adjustment_configure as this is not always implemented
+
+mkspecs
+-------
+
+ - Fix the computation of the location of mkspecs.
+ - [QTBUG-28215] Enable forcing generation of static plugin imports
+ - [QTBUG-28606] Fix installation of plugin module .pris in static Qt builds
+
+moc
+---
+
+ - [QTBUG-26589] Remove the timestamp info in genarated files to optimize rebuilds with ccache
+
+qmake
+-----
+
+ - Do not fixify + create QMAKE_{PKGCONFIG,LIBTOOL}_DESTDIR
+ - Fix qtCompileTest for cross building modules
+ - [QTBUG-28104] Respect the OBJECTS_DIR setting for XCode projects
+ - [QTBUG-24589] Fix handling of precompiled header files in XCode projects
+ - [QTBUG-28624] accept hex/octal values for RC_LANG and RC_CODEPAGE
+ - [QTBUG-28625] fix duplicate TRANSLATION entry in generated RC file
+ - [QTBUG-28682, QTBUG-28683] fix DLL manifest resource ids for debug builds
 
 ****************************************************************************
 *                          Plugins                                         *
 ****************************************************************************
 
+ - Accessibility Linux: Prevent access to invalid interfaces
+ - Call QAccessible::updateAccessibility when caret moves in QTextEdit
 
 ****************************************************************************
 *                   Important Behavior Changes                             *

diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
@@ -0,0 +1,119 @@
+Qt 5.0.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0 and 5.0.1.
+
+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
+-----
+
+ - [QTBUG-29130] Fixed compilation when connecting with the new syntax to a
+   signal that has more than 3 registered meta type arguments, and the compiler
+   does not support variadic templates
+
+QtGui
+-----
+
+QtWidgets
+---------
+
+QtNetwork
+---------
+
+QtDBus
+------
+
+QtConcurrent
+------------
+
+QtOpenGL
+--------
+
+QtTest
+------
+
+QtSql
+-----
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+sqlite
+------
+
+postgres
+--------
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Linux/X11
+----------------
+
+Qt for Windows
+--------------
+
+Qt for Mac OS X
+---------------
+
+Qt for BlackBerry
+-----------------
+
+Qt for Embedded Linux
+---------------------
+
+Qt for Windows CE
+-----------------
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
diff --git a/doc/src/snippets/code/src_network_access_qhttp.cpp b/doc/src/snippets/code/src_network_access_qhttp.cpp
@@ -51,14 +51,14 @@ QString contentType = header.value("content-type");
 
 //! [2]
 QHttpRequestHeader header("GET", QUrl::toPercentEncoding("/index.html"));
-header.setValue("Host", "qt.nokia.com");
-http->setHost("qt.nokia.com");
+header.setValue("Host", "qt-project.org");
+http->setHost("qt-project.org");
 http->request(header);
 //! [2]
 
 
 //! [3]
-http->setHost("qt.nokia.com");                // id == 1
+http->setHost("qt-project.org");                // id == 1
 http->get(QUrl::toPercentEncoding("/index.html")); // id == 2
 //! [3]
 

diff --git a/examples/dbus/chat/chatmainwindow.ui b/examples/dbus/chat/chatmainwindow.ui
@@ -13,7 +13,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>QtDBus Chat</string>
+   <string>Qt D-Bus Chat</string>
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QHBoxLayout" >

diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro
@@ -1,3 +1,5 @@
+requires(qtHaveModule(dbus))
+
 TEMPLATE = subdirs
 SUBDIRS = listnames \
 	  pingpong \

diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
@@ -1,3 +1,5 @@
+requires(if(wince|embedded|x11):qtHaveModule(gui))
+
 TEMPLATE  = subdirs
 SUBDIRS   = styleexample raycasting flickable digiflip
 

diff --git a/examples/examples.pro b/examples/examples.pro
@@ -1,28 +1,23 @@
 TEMPLATE      = subdirs
 CONFIG += no_docs_target
 
-SUBDIRS       = \
-                gui \
-                network \
-                threads \
-                xml \
-                qpa
-
-qtHaveModule(widgets) {
-    SUBDIRS += widgets \
-               ipc \
-               sql \
-               tools \
-               touch \
-               gestures
-}
-
-wince*|embedded|x11:qtHaveModule(gui): SUBDIRS += embedded
-
-contains(QT_BUILD_PARTS, tools):qtHaveModule(gui):qtHaveModule(widgets): SUBDIRS += qtestlib
-qtHaveModule(opengl):qtHaveModule(widgets): SUBDIRS += opengl
-qtHaveModule(dbus): SUBDIRS += dbus
-qtHaveModule(concurrent): SUBDIRS += qtconcurrent
+SUBDIRS = \
+    dbus \
+    embedded \
+    gestures \
+    gui \
+    ipc \
+    network \
+    opengl \
+    qpa \
+    qtconcurrent \
+    qtestlib \
+    sql \
+    threads \
+    tools \
+    touch \
+    widgets \
+    xml
 
 aggregate.files = aggregate/examples.pro
 aggregate.path = $$[QT_INSTALL_EXAMPLES]

diff --git a/examples/gestures/gestures.pro b/examples/gestures/gestures.pro
@@ -1,3 +1,5 @@
+requires(qtHaveModule(widgets))
+
 TEMPLATE      = \
               subdirs
 SUBDIRS       = \

diff --git a/examples/gui/doc/src/rasterwindow.qdoc b/examples/gui/doc/src/rasterwindow.qdoc
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal