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

Conflicts:
	doc/src/development/qmake-manual.qdoc
	mkspecs/symbian-gcce/qmake.conf
	qmake/project.cpp
	src/corelib/global/qnamespace.qdoc
	src/declarative/graphicsitems/qdeclarativetext.cpp
	src/gui/text/qtextdocumentlayout.cpp
	src/gui/text/qtextdocumentlayout_p.h
	tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
	tests/auto/networkselftest/networkselftest.pro
	tests/auto/qscriptengine/tst_qscriptengine.cpp
	tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
	tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt-html-templates.qdocconf
	tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
	tools/qdoc3/test/qt.qdocconf
	tools/qdoc3/test/qt_ja_JP.qdocconf
	tools/qdoc3/test/qt_zh_CN.qdocconf

9 files changed, 41 insertions, 27 deletions

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index e946d5d1ae..f03550dfe1 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -40,7 +40,10 @@ contains(DEFINES,QT_EVAL):include(eval.pri)
 symbian: {
     TARGET.UID3=0x2001B2DC
 
-    # Workaroud for problems with paging this dll
-    MMP_RULES -= PAGED
-    MMP_RULES *= UNPAGED
+    # Problems using data exports from this DLL mean that we can't page it on releases that don't support
+    # data exports (currently that's any release before Symbian^3)
+    pagingBlock = "$${LITERAL_HASH}ifndef SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED" \
+                  "UNPAGED" \
+                  "$${LITERAL_HASH}endif"
+    MMP_RULES += pagingBlock
 }
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 9facad7cc9..0a0232859d 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -1257,6 +1257,13 @@
     to this top level window. This attribute has no effect on non-X11
     platforms.
 
+    \value WA_LockPortraitOrientation Locks the widget to a portrait orientation,
+    ignoring changes to the display's orientation with respect to the user.
+    \value WA_LockLandscapeOrientation Locks the widget to a landscape orientation,
+    ignoring changes to the display's orientation with respect to the user.
+    \value WA_AutoOrientation Causes the widget to change orientation whenever the
+    display changes orientation with respect to the user.
+    
     \value WA_MacNoShadow Since Qt 4.8, this attribute disables drop shadows
     for this top level window. Only affects Cocoa builds of Qt for Mac OS X.
 
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 26a398e0bc..be86c58d47 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -472,10 +472,10 @@ QString qAppName()
     operations can call processEvents() to keep the application
     responsive.
 
-    In general, we recommend that you create a QCoreApplication or
-    a QApplication object in your \c main() function as early as
-    possible. exit() will not return until the event loop exits;
-    e.g., when quit() is called.
+    In general, we recommend that you create a QCoreApplication or a
+    QApplication object in your \c main() function as early as
+    possible. exec() will not return until the event loop exits; e.g.,
+    when quit() is called.
 
     Several static convenience functions are also provided. The
     QCoreApplication object is available from instance(). Events can
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 47d3a3b8eb..a2bb7d1597 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -138,7 +138,7 @@ template <typename T>
 void *qMetaTypeConstructHelper(const T *t)
 {
     if (!t)
-        return new T;
+        return new T();
     return new T(*static_cast<const T*>(t));
 }
 
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index cc81c1b719..b281c1b0b7 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -492,7 +492,7 @@ QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel)
 #endif
 
 /*!
-    \fn QByteArray qUncompress(const QByteArray& data)
+    \fn QByteArray qUncompress(const QByteArray &data)
 
     \relates QByteArray
 
@@ -506,10 +506,10 @@ QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel)
     feature was added.
 
     \bold{Note:} If you want to use this function to uncompress external
-    data compressed using zlib, you first need to prepend four bytes to the
-    byte array that contain the expected length (as an unsigned integer)
-    of the uncompressed data encoded in big-endian order (most significant
-    byte first).
+    data that was compressed using zlib, you first need to prepend a four
+    byte header to the byte array containing the data. The header must
+    contain the expected length (in bytes) of the uncompressed data,
+    expressed as an unsigned, big-endian, 32-bit integer.
 
     \sa qCompress()
 */
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 801600a1fd..7daf95abe1 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -92,14 +92,18 @@
     animation.setEasingCurve(QEasingCurve::InOutQuad);
     \endcode
 
-    The ability to set an amplitude, overshoot, or period depends on the QEasingCurve type. Amplitude access
-    is available to curves that behave as springs such as elastic and bounce curves. Changing the amplitude changes
-    the height of the curve. Period access is only available to elastic curves and setting a higher period slows
-    the rate of bounce. Only curves that have "boomerang" behaviors such as the InBack, OutBack, InOutBack, and OutInBack 
-    have overshoot settings. These curves will interpolate beyond the end points and return to the end point, 
-    acting similar to a boomerang.
-
-    The \l{Easing Curves Example} contains samples of QEasingCurve types and lets you change the curve settings.
+    The ability to set an amplitude, overshoot, or period depends on
+    the QEasingCurve type. Amplitude access is available to curves
+    that behave as springs such as elastic and bounce curves. Changing
+    the amplitude changes the height of the curve. Period access is
+    only available to elastic curves and setting a higher period slows
+    the rate of bounce. Only curves that have "boomerang" behaviors
+    such as the InBack, OutBack, InOutBack, and OutInBack have
+    overshoot settings. These curves will interpolate beyond the end
+    points and return to the end point, acting similar to a boomerang.
+
+    The \l{Easing Curves Example} contains samples of QEasingCurve
+    types and lets you change the curve settings.
 
  */
 
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index fcfa8f0c55..6515edbca1 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -2199,7 +2199,7 @@ static quint16 localePrivateIndex(const QLocalePrivate *p)
 /*!
     Constructs a QLocale object with the specified \a name,
     which has the format
-    "language[_country][.codeset][@modifier]" or "C", where:
+    "language[_territory][.codeset][@modifier]" or "C", where:
 
     \list
     \i language is a lowercase, two-letter, ISO 639 language code,
diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h
index a8ae40c7dd..a2a805250f 100644
--- a/src/corelib/tools/qset.h
+++ b/src/corelib/tools/qset.h
@@ -335,7 +335,7 @@ class QMutableSetIterator
     typedef typename QSet<T>::iterator iterator;
     QSet<T> *c;
     iterator i, n;
-    inline bool item_exists() const { return n != c->constEnd(); }
+    inline bool item_exists() const { return c->constEnd() != n; }
 
 public:
     inline QMutableSetIterator(QSet<T> &container)
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 95c80a1503..b7272ecde3 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -658,10 +658,11 @@ const QString::Null QString::null = { };
     class.)
 
     \table 100 %
+    \header
+    \o Note for C Programmers
+
     \row
     \o
-    \section1 Note for C Programmers
-
     Due to C++'s type system and the fact that QString is
     \l{implicitly shared}, QStrings may be treated like \c{int}s or
     other basic types. For example:
@@ -3890,8 +3891,7 @@ const char *QString::latin1_helper() const
     If \a size is -1 (default), it is taken to be qstrlen(\a
     str).
 
-    QTextCodec::codecForLocale() is used to perform the conversion
-    from Unicode.
+    QTextCodec::codecForLocale() is used to perform the conversion.
 
     \sa toLocal8Bit(), fromAscii(), fromLatin1(), fromUtf8()
 */