From: Qt Continuous Integration System <qt-info@nokia.com>
Date: Wed, 11 May 2011 14:49:55 +0000 (+1000)
Subject: Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
X-Git-Tag: qt-v5.0.0-alpha1~4314
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1355da4b0f212921aeff201960a11ef8de6625a0;p=profile%2Fivi%2Fqtbase.git

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  update def files
  emit QNetWorkAccessManager::finished on QNetworkReply::abort()
  Don't run XLib check if -no-gui is used
  don't ignore create_prl for static plugins
  make QLibraryInfo return clean paths
  make relative paths in qt.conf work inside qmake
  Sockets: Fix potential null pointer usages
  QNAM: Re-order checks in migrateBackend()
  Fix initial main window dimensions for "fullscreen with softkeys" case
  Fix spelling mistake
  Fixes crash in QWidget::effectiveWinId.
  Fix crash when QSocketNotifier used with an invalid descriptor
  Optimisation - buffer packet read in pendingDatagramSize
  Remove warnings when disabling notifications on a closed socket
  Fix some warnings in symbian network tests
---

1355da4b0f212921aeff201960a11ef8de6625a0