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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Hide some more files from git-status.
  Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.
  Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.
  Fixed deployment locations for various profiles.
  Added a top-level runonphone target for Qt and QtWebKit.
  QS60Style: Simplify QMenu drawing
  QS60Style: Remove gap from QProgressDialog
  ColorDialog is incorrectly positioned
  Support for "deploy" make target in Symbian
  qtguiu.def merge conflict fix
  Fix for include "private/qt_s60_p.h" in non-symbian builds
  Making orbit input methods work with Qt apps with -no-s60
  Using the remaining valid data to construct the QTime object when msec parsing failed.
  QProgressDialog text is too close to dialog border
  fix for broken input method loading
  Avkon Removal DEF file updates
  Stub version of QS60Style
  Avkon removal configured with -no-s60
  QFileDialog broken in landscape in N8

1 files changed, 7 insertions, 0 deletions

diff --git a/configure b/configure
index 4650229..01040e3 100755
--- a/configure
+++ b/configure
@@ -7627,6 +7627,13 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
 EOF
 fi
 
+if [ -n "$QT_LIBINFIX" ]; then
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#define QT_LIBINFIX "$QT_LIBINFIX"
+
+EOF
+fi
+
 # avoid unecessary rebuilds by copying only if qconfig.h has changed
 if cmp -s "$outpath/src/corelib/global/qconfig.h" "$outpath/src/corelib/global/qconfig.h.new"; then
     rm -f "$outpath/src/corelib/global/qconfig.h.new"