Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix license headers on these new files (and the generator).
  Add auto-generated tests for QScriptValue
  Add changes for 4.6.2
  Changelog: Added Designer/uic3 changes for 4.6.2
  Revert "Improve raster graphics system performance on Mac."
  Introduce of QScriptValue autotest generator.
  Fixed potential crash in mac style
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 69dd29fbeb12d076741dce70ac6bc155101ccd6f )
  Remove PrintDialog frame on Mac
  Fix missing non-unified toolbar margins on Mac
  Add a warning when there are duplicate aliases in a resource file.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a733444d3be6605552471f047558927495ff62b7 )
  Improve raster graphics system performance on Mac.
  Fixed compile of framecapture, simpleselector for symbian-abld winscw.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index e41cd55..1f6e58f 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -544,6 +544,8 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
     const QString filename = nodes.at(nodes.size()-1);
     RCCFileInfo *s = new RCCFileInfo(file);
     s->m_parent = parent;
+    if (parent->m_children.contains(filename))
+        qWarning("potential duplicate alias detected: '%s'", qPrintable(filename));
     parent->m_children.insertMulti(filename, s);
     return true;
 }