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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Use a shared QScriptEngine for debugger console command scripts
  Fix QtScript debugger hang/crash issue with updating locals model
  doc:	Fixed some qdoc warnings.
  Always activate popup windows on show
  doc:	Fixed some qdoc warnings.
  Add the QMAKE_FILE_EXT variable to extra compilers generation.
  Cocoa: Tool Windows steal focus from the main window
  qdoc3: Removed a debug output.
  Update QTestLib documentation with chart use case.

2 files changed, 23 insertions, 3 deletions

diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index be4339c..15748fe 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -533,6 +533,15 @@ QByteArray QNetworkReply::rawHeader(const QByteArray &headerName) const
     return QByteArray();
 }
 
+/*! \typedef QNetworkReply::RawHeaderPair
+
+  RawHeaderPair is a QPair<QByteArray, QByteArray> where the first
+  QByteArray is the header name and the second is the header.
+ */
+
+/*!
+  Returns a list of raw header pairs.
+ */
 const QList<QNetworkReply::RawHeaderPair>& QNetworkReply::rawHeaderPairs() const
 {
     Q_D(const QNetworkReply);
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 52b88a3..b8438a2 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -532,13 +532,24 @@ QNetworkRequest::Priority QNetworkRequest::priority() const
     return d->priority;
 }
 
+/*! \enum QNetworkRequest::Priority
+
+  \since 4.7
+  
+  This enum lists the possible network request priorities.
+
+  \value HighPriority   High priority
+  \value NormalPriority Normal priority
+  \value LowPriority    Low priority
+ */
+
 /*!
     \since 4.7
 
-    Set the priority of this request.
+    Set the priority of this request to \a priority.
 
-    \note The priority is only a hint to the network access manager.
-    It can use it or not. Currently it is used for HTTP to
+    \note The \a priority is only a hint to the network access
+    manager.  It can use it or not. Currently it is used for HTTP to
     decide which request should be sent first to a server.
 
     \sa priority()