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

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (25 commits)
  Added some of my Qt 4.8 changes to the changelog
  Update bearer startup code in network autotests
  symbian socket engine: share ip address conversion code
  license header check: fix exception for URL TLD table
  QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."
  Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore
  fix Symbian ordinals for merge request re. utf8 characters in SSL certs
  add auto test for SSL certificates containing utf8 characters
  fix coding style for merge request re. utf8 characters in SSL certs
  Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName
  Fix the build for QUuid
  Improved performance of the QLocale::name() function.
  Optimize QUuid::QUuid(const char *)
  QDataStream: speedup steaming of QUuid.
  Add QUuid::toRfc4122() and fromRfc4122()
  Add QUuid::toByteArray() and relevant
  Optimize QUuid::toString() and relevant
  Add some autotests and benchmarks for QUuid
  tst_qhostinfo: Fix IPv6 lookup detection on Windows.
  Fix typo in comment
  ...

1 files changed, 5 insertions, 1 deletions

diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h
index f42ca91..832d5bc 100644
--- a/src/corelib/plugin/quuid.h
+++ b/src/corelib/plugin/quuid.h
@@ -108,8 +108,12 @@ struct Q_CORE_EXPORT QUuid
     QUuid(const QString &);
     QUuid(const char *);
     QString toString() const;
-    operator QString() const { return toString(); }
+    operator QString() const { return toString(); } // ### Qt5 remove
+    QUuid(const QByteArray &);
+    QByteArray toByteArray() const;
 #endif
+    QByteArray toRfc4122() const;
+    static QUuid fromRfc4122(const QByteArray &);
     bool isNull() const;
 
     bool operator==(const QUuid &orig) const