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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (118 commits)
  Updated DEF files for QtOpenGL for WINSCW and ARMV5
  Fix link error on MacOS
  Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)
  Set no brush when the brush is a solid patern transparent color.
  Fixed networkselftest failing to resolve hostname
  tst_qmessagebox: fix `about' test on mac
  tst_qmessagebox: make the failure message better for detailsButtonText
  tst_qmessagebox: simulate key events more robustly
  Clear WSERV content when a native child receives an "expose"
  Fixed a bug in elf2e32_qtwrapper regarding spaces in def files.
  Fixed several compile and deployment issues in the mmf phonon plugin.
  Fix fullscreen/Maximized dialog misplacement in Symbian
  Whitespace change
  Fix for coding conventions.
  Fix resource leak in QCLuceneStandardAnalyzer::QCLuceneStandardAnalyzer.
  Fix resource leak in QCLuceneStopAnalyzer::QCLuceneStopAnalyzer.
  Add Postgresql 8.x and 9 supports
  WorkerScript could starve image loading of CPU.
  More docs for FolderListModel
  Improve docs on attached properties on view delegates.
  ...

1 files changed, 1 insertions, 0 deletions

diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro
index 6973955..855eb9e 100644
--- a/tests/auto/qmovie/qmovie.pro
+++ b/tests/auto/qmovie/qmovie.pro
@@ -12,6 +12,7 @@ wince*: {
    DEPLOYMENT += addFiles
 }
 
+RESOURCES += resources.qrc
 
 symbian: {
    addFiles.files = animations\\*