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

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: (114 commits)
  Fixed license header.
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
  Remove Q_ASSERT's from qsharedmemory autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT's from qabstractxmlnodemodel test
  Remove Q_ASSERT from QXmlStream autotest
  Remove Q_ASSERT from qxmlquery autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from QItemModel autotest
  Remove Q_ASSERT's from qxmlquery autotest
  Remove Q_ASSERT from qxmlquery autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from qabstractxmlnodemodel test
  Remove Q_ASSERT from qscriptvaluegenerated test
  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 from qscriptvaluegenerated test
  Remove Q_ASSERT's from qscriptvaluegenerated test
  ...

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/auto/qcopchannel/testSend/main.cpp b/tests/auto/qcopchannel/testSend/main.cpp
index 91628e5..a56883b 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;