Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	qmake/generators/win32/msbuild_objectmodel.cpp
	qmake/generators/win32/msvc_vcxproj.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp

3 files changed, 136 insertions, 2 deletions

diff --git a/dist/changes-4.6.4 b/dist/changes-4.6.4
index 381023f869..389aa3a8f3 100644
--- a/dist/changes-4.6.4
+++ b/dist/changes-4.6.4
@@ -63,8 +63,12 @@ QtNetwork
 QtOpenGL
 --------
 
- - foo
-    * bar
+ - QGLShaderProgram
+    * [QTBUG-12478] Don't resolve GLSL extensions if no shaders.
+    * [QTBUG-12591] setUniformValue(QSize) was setting (w,w) not (w,h).
+    * [QTBUG-12862] Don't #define highp/mediump/lowp if the desktop OpenGL
+      implementation has the GL_ARB_ES2_compatibility extension.
+    * [QTBUG-12554] Wrong OpenGLVersionFlags on OpenGL 4.0 systems.
 
 QtScript
 --------
diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 790aabc62a..01ebf63d5c 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -478,6 +478,18 @@ QtCore:
     line breaking, reporting the index of the boundary at which the line
     break should occur rather than the index of the character.
 
+QtGui:
+  - QWidget::setLayoutDirection no longer affects the text layout
+    direction (Qt::LeftToRight or Qt::RightToLeft) of QTextEdit, QLineEdit
+    and widgets based on them. The default text layout direction
+    (Qt::LayoutDirectionAuto) is now detected from keyboard layout and
+    language of the text (conforms to Unicode standards). To
+    programmatically force the text direction of a QTextEdit, you can
+    change the defaultTextOption of the QTextDocument associated with that
+    widget with a new QTextOption of different textDirection property. For
+    QLineEdit, the only way so far is sending a Qt::Key_Direction_L/R
+    keyboard event to that widget.
+
 QtNetwork:
   - Qt does no longer provide its own CA bundle, but uses system APIs for
     retrieving the default system certificates.
diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
new file mode 100644
index 0000000000..c8b26c277a
--- /dev/null
+++ b/dist/changes-4.7.1
@@ -0,0 +1,118 @@
+Qt 4.7.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.7.0.  For more details,
+refer to the online documentation included in this distribution. The
+documentation is also available online:
+
+  http://qt.nokia.com/doc/4.7
+
+The Qt version 4.7 series is binary compatible with the 4.6.x series.
+Applications compiled for 4.6 will continue to run with 4.7.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker, the (now obsolete) Task
+Tracker, or the Merge Request queue of the public source repository.
+
+Qt Bug Tracker: http://bugreports.qt.nokia.com
+Task Tracker:   http://qt.nokia.com/developer/task-tracker
+Merge Request:  http://qt.gitorious.org
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Optimizations
+-------------
+
+ - Improved the benchmarking library's timing code
+    * Uses a faster access to the system clock
+
+ * See list of Important Behavior Changes below
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtCore
+------
+
+
+QtGui
+-----
+
+
+QtDBus
+------
+
+
+QtMultimedia
+------------
+
+
+QtNetwork
+---------
+
+
+QtOpenGL
+--------
+
+
+QtOpenVG
+--------
+
+
+QtWebKit
+--------
+
+
+QtSql
+-----
+
+
+QtSvg
+-----
+
+
+Qt Plugins
+----------
+
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Unix (X11 and Mac OS X)
+------------------------------
+
+
+Qt for Linux/X11
+----------------
+
+
+Qt for Windows
+--------------
+
+
+Qt for Mac OS X
+---------------
+
+
+Qt for Symbian
+--------------
+
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+ - Designer
+
+ - uic
+
+****************************************************************************
+*                     Important Behavior Changes                           *
+****************************************************************************
+
+