Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  tst_qtextcodec: Fix broken merge conflict resolution
  tst_qtextcodec: Fix broken merge conflict resolution
  Added some changes for 4.6.3
  Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
  Allow auto-test to compile when using namespaces
  Fix regression in QVarLengthArray::operator=
  Removed unnecessary PlatSec capabilities from spectrum demo DLL
  Make test work with shadow builds again.
  Added missing PlatSec capabilities to spectrum demo DLL
  My 4.6.3 changes
  Tidy changes file for 4.6.3.
  My 4.6.3 changes
  My 4.6.3 changes
  Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
  Build fix for spectrum demo when -qtnamespace is used
  Fixed license headers in spectrum demo
  Qt app draws background incorrectly when animated wallpaper is used
  Don't use QAtomicInt in statics because they are non-POD.
  QTBUG-5955: Qt fails to build on alpha architecture

1 files changed, 9 insertions, 2 deletions

diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp
index 8b79533..e908961 100644
--- a/tests/auto/qprinter/tst_qprinter.cpp
+++ b/tests/auto/qprinter/tst_qprinter.cpp
@@ -64,11 +64,13 @@
 
 Q_DECLARE_METATYPE(QRect)
 
-
+QT_FORWARD_DECLARE_CLASS(QPrinter)
 
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#ifndef QT_NO_PRINTER
+
 class tst_QPrinter : public QObject
 {
     Q_OBJECT
@@ -217,7 +219,6 @@ tst_QPrinter::tst_QPrinter()
 
 tst_QPrinter::~tst_QPrinter()
 {
-
 }
 
 // initTestCase will be executed once before the first testfunction is executed.
@@ -1056,3 +1057,9 @@ void tst_QPrinter::testPdfTitle()
 
 QTEST_MAIN(tst_QPrinter)
 #include "tst_qprinter.moc"
+
+#else //QT_NO_PRINTER
+
+QTEST_NOOP_MAIN
+
+#endif //QT_NO_PRINTER