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

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (84 commits)
  Reduce usage of Q_ASSERT in autotests.
  Fixed license header.
  Remove Q_ASSERT's from qsharedmemory autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT from QXmlStream autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from QItemModel autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from QVariant autotest
  Remove Q_ASSERT's from QTreeView autotest
  Remove Q_ASSERT from qtesselator autotest
  Remove unused function from qtessellator autotest
  Remove Q_ASSERT's from qreadwritelock autotest
  Remove Q_ASSERT's from QObject autotest
  Remove Q_ASSERT's from QObject autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT from qitemmodel autotest
  Remove Q_ASSERT's from QMutex autotest
  Remove Q_ASSERT from QMetaType autotest
  Remove Q_ASSERT's in qitemview autotest
  ...

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/auto/qcopchannel/testSend/main.cpp b/tests/auto/qcopchannel/testSend/main.cpp
index 91628e501f..a56883be99 100644
--- a/tests/auto/qcopchannel/testSend/main.cpp
+++ b/tests/auto/qcopchannel/testSend/main.cpp
@@ -49,7 +49,11 @@ int main(int argc, char** argv)
 #ifdef Q_WS_QWS
     QApplication app(argc, argv);
     QStringList args = app.arguments();
-    Q_ASSERT(args.count() ==  3 || args.count() == 4);
+    if (args.count() != 3 && args.count() != 4) {
+        fprintf(stdout,qPrintable(QString("Usage: %1 channel message [data]").arg(args.at(0))));
+        fflush(stdout);
+        return 1;
+    }
     QString channelName = args.at(1);
     QString msg = args.at(2);
     QByteArray data;