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.

1 files changed, 2 insertions, 16 deletions

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 ---