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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  use intel linker and librarian with icc
  create missing output directories for substituted files
  fix shadow builds with scratchbox
  QMake/Win32/MinGW: Fix ar script generating with absolute paths
  Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog on Mac
  Crash in QX11PaintEngine::drawPixmap
  Revert "Fix the rendering of lines with the X11 paint engine"
  Revert "Outline / fill inconsistency in X11 paint engine."

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/auto/qapplication/modal/main.cpp b/tests/auto/qapplication/modal/main.cpp
new file mode 100644
index 0000000..e1d39cf
--- /dev/null
+++ b/tests/auto/qapplication/modal/main.cpp
@@ -0,0 +1,11 @@
+#include <QtGui>
+
+#include <QApplication>
+#include "base.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    base *b = new base();
+    return app.exec();
+}