Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix #pragma message(), the message must be enclosed in parentheses
  preserve non-standard source references
  QSslConfiguration: fix crash when accessing null pointer
  properly parse ts contexts in obsolete messages
  move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler
  Fix static build on Windows with MinGW.
  Reenable the reporting of CPU features.
  make qdoc3 boot-strappable again
  fix MinGW cross compilation with -debug-and-release
  Updated and new Slovenian translations for Qt 4.7
  Designer: Fix crash on unsupported Language/Country combination.
  Doc: Fixed qdoc warnings and generalized the date and time descriptions.
  Doc: Whitespace fixes.
  Doc: Fixed snippets in QML introduction broken in an earlier commit.
  doc: Fixed numerous qdoc warnings.

6 files changed, 27 insertions, 68 deletions

diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index a0779c9..957abbf 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -66,6 +66,8 @@ QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 
+extern void qDumpCPUFeatures(); // in qsimd.cpp
+
 #ifndef QT_NO_SETTINGS
 
 struct QLibrarySettings
@@ -500,7 +502,6 @@ QT_END_NAMESPACE
 extern const char qt_core_interpreter[] __attribute__((section(".interp")))
     = ELF_INTERPRETER;
 
-extern void qDumpCPUFeatures(); // in qsimd.cpp
 extern "C" void qt_core_boilerplate();
 void qt_core_boilerplate()
 {
@@ -526,7 +527,7 @@ void qt_core_boilerplate()
            qt_configure_libraries_path_str + 12,
            qt_configure_headers_path_str + 12);
 
-//    qDumpCPUFeatures();
+    QT_PREPEND_NAMESPACE(qDumpCPUFeatures)();
 
 #ifdef QT_EVAL
     extern void qt_core_eval_init(uint);
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 0b3b164..7a622f1 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7758,18 +7758,21 @@ void QGraphicsItemPrivate::resetHeight()
 }
 
 /*!
-  \property QGraphicsObject::children
-  \internal
+    \property QGraphicsObject::children
+    \since 4.7
+    \internal
 */
 
 /*!
-  \property QGraphicsObject::width
-  \internal
+    \property QGraphicsObject::width
+    \since 4.7
+    \internal
 */
 
 /*!
-  \property QGraphicsObject::height
-  \internal
+    \property QGraphicsObject::height
+    \since 4.7
+    \internal
 */
 
 /*!
@@ -7985,24 +7988,6 @@ void QGraphicsItemPrivate::resetHeight()
 */
 
 /*!
-    \property QGraphicsObject::children
-    \since 4.7
-    \internal
-*/
-
-/*!
-    \property QGraphicsObject::width
-    \since 4.7
-    \internal
-*/
-
-/*!
-    \property QGraphicsObject::height
-    \since 4.7
-    \internal
-*/
-
-/*!
     \class QAbstractGraphicsShapeItem
     \brief The QAbstractGraphicsShapeItem class provides a common base for
     all path items.
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
index bd3f2ef..1f155c6 100644
--- a/src/gui/graphicsview/qgraphicstransform.cpp
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -346,21 +346,24 @@ void QGraphicsScale::applyTo(QMatrix4x4 *matrix) const
 
 /*!
     \fn QGraphicsScale::xScaleChanged()
+    \since 4.7
 
-    QGraphicsScale emits this signal when its xScale changes.
+    This signal is emitted whenever the \l xScale property changes.
 */
 
 /*!
     \fn QGraphicsScale::yScaleChanged()
+    \since 4.7
 
-    QGraphicsScale emits this signal when its yScale changes.
+    This signal is emitted whenever the \l yScale property changes.
 */
 
 /*!
     \fn QGraphicsScale::zScaleChanged()
+    \since 4.7
 
-    QGraphicsScale emits this signal when its zScale changes.
-*/    
+    This signal is emitted whenever the \l zScale property changes.
+*/
 
 /*!
     \fn QGraphicsScale::scaleChanged()
@@ -583,27 +586,6 @@ void QGraphicsRotation::applyTo(QMatrix4x4 *matrix) const
     \sa QGraphicsRotation::axis
 */
 
-/*!
-    \fn QGraphicsScale::xScaleChanged()
-    \since 4.7
-
-    This signal is emitted whenever the \l xScale property changes.
-*/
-
-/*!
-    \fn QGraphicsScale::yScaleChanged()
-    \since 4.7
-
-    This signal is emitted whenever the \l yScale property changes.
-*/
-
-/*!
-    \fn QGraphicsScale::zScaleChanged()
-    \since 4.7
-
-    This signal is emitted whenever the \l zScale property changes.
-*/
-
 #include "moc_qgraphicstransform.cpp"
 
 QT_END_NAMESPACE
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index 7a61dc7..bd6c577 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -248,7 +248,7 @@ void QDateTimeEdit::setDateTime(const QDateTime &datetime)
 
 /*!
   \property QDateTimeEdit::date
-  \brief the QDate that is set in the QDateTimeEdit
+  \brief the QDate that is set in the widget
 
   By default, this property contains a date that refers to January 1, 2000.
 
@@ -279,7 +279,7 @@ void QDateTimeEdit::setDate(const QDate &date)
 
 /*!
   \property QDateTimeEdit::time
-  \brief the QTime that is set in the QDateTimeEdit
+  \brief the QTime that is set in the widget
 
   By default, this property contains a time of 00:00:00 and 0 milliseconds.
 
@@ -1555,13 +1555,6 @@ QTimeEdit::QTimeEdit(const QTime &time, QWidget *parent)
 {
 }
 
-/*!
-    \property QTimeEdit::time
-    \brief the QTime that is shown in the widget
-
-    By default, this property contains a time of 00:00:00 and 0 milliseconds.
-*/
-
 
 /*!
   \class QDateEdit
@@ -1616,13 +1609,6 @@ QDateEdit::QDateEdit(const QDate &date, QWidget *parent)
 {
 }
 
-/*!
-    \property QDateEdit::date
-    \brief the QDate that is shown in the widget
-
-    By default, this property contains a date referring to January 1, 2000.
-*/
-
 
 // --- QDateTimeEditPrivate ---
 
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 91265f3..f18c629 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1966,6 +1966,11 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri
     QMutexLocker locker(&globalData()->mutex);
     const QSslConfigurationPrivate *global = globalData()->config.constData();
 
+    if (!global) {
+        ptr = 0;
+        return;
+    }
+
     ptr->ref = 1;
     ptr->peerCertificate = global->peerCertificate;
     ptr->peerCertificateChain = global->peerCertificateChain;
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index d545440..bf19a88 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
 static const char *qt_inherit_text = "inherit";
 #define QT_INHERIT QLatin1String(qt_inherit_text)
 
-Q_DECL_IMPORT double qstrtod(const char *s00, char const **se, bool *ok);
+Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
 
 // ======== duplicated from qcolor_p