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

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (104 commits)
  Documentation: clarified RVCT support for Symbian
  Update Symbian OS def files for 4.6.2
  Remove the installer from the Qt sources.
  Don't remove all dependencies when patching the pkg.
  Fixes qabstractslider autotest
  Workaround for abld toolchain issue with s60main
  Add a recursive rule for running the auto-tests.
  Do not run the tests automatically during install.
  Enabling runfast mode when vfpv2 used.
  Fixing a test case to be runnable on Symbian device.
  [CRASH] audioinput and audiooutput examples crash when no devices are
  Fixed casual crash in initializeDb (Symbian)
  Fixes scrolling horizontally with a mouse wheel over sliders.
  don't use QKeySequence::mnemonic() after all
  Fixed qt_x11_wait_for_window_manager
  Revert change 34f1758 on non-Synbian platforms
  Fixed QGifHandler::loopCount().
  Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
  don't use stylesheet for just making labels bold
  ...

1 files changed, 0 insertions, 59 deletions

diff --git a/tools/installer/nsis/confirmpage.ini b/tools/installer/nsis/confirmpage.ini
deleted file mode 100644
index b42132c..0000000
--- a/tools/installer/nsis/confirmpage.ini
+++ /dev/null
@@ -1,59 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-;; All rights reserved.
-;; Contact: Nokia Corporation (qt-info@nokia.com)
-;;
-;; This file is part of the tools applications of the Qt Toolkit.
-;;
-;; $QT_BEGIN_LICENSE:LGPL$
-;; No Commercial Usage
-;; This file contains pre-release code and may not be distributed.
-;; You may use this file in accordance with the terms and conditions
-;; contained in the Technology Preview License Agreement accompanying
-;; this package.
-;;
-;; GNU Lesser General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU Lesser
-;; General Public License version 2.1 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.LGPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU Lesser General Public License version 2.1 requirements
-;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-;;
-;; In addition, as a special exception, Nokia gives you certain additional
-;; rights.  These rights are described in the Nokia Qt LGPL Exception
-;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-;;
-;; If you have questions regarding the use of this file, please contact
-;; Nokia at qt-info@nokia.com.
-;;
-;;
-;;
-;;
-;;
-;;
-;;
-;;
-;; $QT_END_LICENSE$
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Ini file generated by the HM NIS Edit IO designer.
-[Settings]
-NumFields=2
-
-[Field 1]
-Type=Label
-Text=The following components will be uninstalled:
-Left=1
-Right=298
-Top=1
-Bottom=12
-
-[Field 2]
-Type=Label
-Left=16
-Right=298
-Top=16
-Bottom=136
-