Merge branch '4.6'

Conflicts:
	doc/src/qt4-intro.qdoc

INSTALL

@@ -0,0 +1,150 @@
+        INSTALLING Qt Source Package Version %VERSION%.
+
+1.  If you have the commercial edition of Qt, install your license
+    file as $HOME/.qt-license if you are on Unix. If you are on
+    Windows, copy the license file into your home directory
+    (this may be known as the userprofile environment variable) and
+    rename it to .qt-license. For example on Windows XP,
+    %USERPROFILE% should be something like C:\Documents and
+    Settings\username.
+
+    For the open source version you do not need a license file.
+
+2.  Unpack the archive if you have not done so already:
+
+    On Unix (X11 and Mac):
+        cd /tmp
+        gunzip %DISTNAME%.tar.gz        # uncompress the archive
+        tar xvf %DISTNAME%.tar          # unpack it
+
+    This creates the directory /tmp/%DISTNAME% containing the files
+    from the archive. We only support the GNU version of the tar
+    archiving utility. Note that on some systems it is called gtar.
+
+    On Windows, uncompress the files into the directory you want Qt
+    installed, e.g. C:\Qt\%VERSION%.
+
+    NOTE: The install path must not contain any spaces.
+
+4. Environment variables
+
+   In order to build and use Qt, the PATH environment variable needs
+   to be extended to locate qmake, moc and other Qt tools
+
+   On Windows, this is done by adding C:\Qt\%VERSION%\bin
+   to the PATH variable. On Unix, this is done by adding
+   /tmp/%DISTNAME%.
+
+   For newer versions of Windows, PATH can be extended through
+   "Control Panel->System->Advanced->Environment variables" and for
+   older versions by editing C:\autoexec.bat.
+
+   In .profile (if your Unix shell is bash), add the following lines:
+
+        PATH=/usr/local/Trolltech/Qt-%VERSION%/bin:$PATH
+        export PATH
+
+   In .login (in case your Unix shell is csh or tcsh), add the following line:
+
+        setenv PATH /usr/local/Trolltech/Qt-%VERSION%/bin:$PATH
+
+   If you use a different Unix shell, please modify your environment
+   variables accordingly.
+
+   For some X11 compilers that do not support rpath you must also
+   extended the LD_LIBRARY_PATH environment variable to include
+   /usr/local/Trolltech/Qt-%VERSION%/lib. On Linux or Mac with GCC
+   this step is not needed.
+
+4.  Building
+
+4.1 Building on Unix
+
+    To configure the Qt library for your machine type, run the
+    ./configure script in the package directory.
+
+    By default, Qt is configured for installation in the
+    /usr/local/Trolltech/Qt-%VERSION% directory, but this can be
+    changed by using the -prefix option. Alternatively, the
+    -prefix-install option can be used to specify a "local"
+    installation within the source directory.
+
+        cd /tmp/%DISTNAME%
+        ./configure
+
+    Type "./configure -help" to get a list of all available options.
+
+    To create the library and compile all the demos, examples, tools,
+    and tutorials, type:
+
+        make
+
+    If you did not configure Qt using the -prefix-install option,
+    you need to install the library, demos, examples, tools, and
+    tutorials in the appropriate place. To do this, type:
+
+        su -c "make install"
+
+    and enter the root password. On some systems, you have to use the
+    sudo command as follows:
+
+        sudo make install
+
+    and enter your password, this requires that you have administrator access
+    to your machine.
+
+    Note that on some systems the make utility is named differently,
+    e.g. gmake. The configure script tells you which make utility to
+    use.
+
+    If you need to reconfigure and rebuild Qt from the same location,
+    ensure that all traces of the previous configuration are removed
+    by entering the build directory and typing
+
+        make confclean
+
+    before running the configure script again.
+
+4.2 Building on Windows
+
+    To configure the Qt library for your machine type:
+
+        C:
+        cd \Qt\%VERSION%
+        configure
+
+    Type "configure -help" to get a list of all available options.
+
+    If you are using the "-direct3d" option, make sure that you have
+    the Direct3D SDK installed, and that you have run the
+    %DXSDK_DIR%\Utilities\Bin\dx_setenv.cmd command, before attempting
+    to run configure.
+
+    The actual commands needed to build Qt depends on your development
+    system. For Microsoft Visual Studio to create the library and
+    compile all the demos, examples, tools and tutorials type:
+
+        nmake
+
+    If you need to reconfigure and rebuild Qt from the same location,
+    ensure that all traces of the previous configuration are removed
+    by entering the build directory and typing
+
+        nmake confclean
+
+    before running the configure script again.
+
+5.  That's all. Qt is now installed.
+
+    If you are new to Qt, we suggest that you take a look at the demos
+    and examples to see Qt in action. Run the Qt Examples and Demos
+    either by typing 'qtdemo' on the command line or through the
+    desktop's Start menu.
+
+    You might also want to try the following links:
+
+        http://qt.nokia.com/doc/%VERSION%/how-to-learn-qt.html
+        http://qt.nokia.com/doc/%VERSION%/tutorial.html
+        http://qt.nokia.com/developer
+
+    We hope you will enjoy using Qt. Good luck!

README.s60

@@ -0,0 +1,181 @@
+This is Qt version %VERSION%.
+
+Qt is a comprehensive cross-platform C++ application framework. With
+this pre-release you can make advanced graphical applications and
+utilize TCP/IP connections. More specifically, these modules are now
+available for S60:
+
+QtCore    - http://doc.trolltech.com/4.5/qtcore.html
+QtGui     - http://doc.trolltech.com/4.5/qtgui.html
+QtNetwork - http://doc.trolltech.com/4.5/qtnetwork.html
+QtScript  - http://doc.trolltech.com/4.5/qtscript.html
+QtSql     - http://doc.trolltech.com/4.5/qtsql.html
+QtSvg     - http://doc.trolltech.com/4.5/qtsvg.html
+QtTest    - http://doc.trolltech.com/4.5/qttest.html
+QtWebKit  - http://doc.trolltech.com/4.5/qtwebkit.html
+QtXml     - http://doc.trolltech.com/4.5/qtxml.html
+Phonon    - http://doc.trolltech.com/4.5/phonon-module.html
+
+INSTALLING Qt
+
+Follow the instructions in the INSTALL file.
+
+REFERENCE DOCUMENTATION
+
+The Qt reference documentation is available locally in Qt's doc/html
+directory or at http://doc.trolltech.com/4.5/index.html
+
+SUPPORTED PLATFORMS
+
+For this release, the following platforms have been tested:
+
+   S60 3.1, 3.2 and 5.0
+
+with these compilers:
+
+   WINSCW (Emulator, X86)
+   RVCT (Hardware, ARM)
+   GCCE (Hardware, ARM)*
+
+The current version of GCCE cannot compile the Qt libraries
+themselves as it has issues with global static data in DLLs.
+However, we supply precompiled Qt libraries compiled with RVCT
+that can be used instead. This makes it possible to write and
+compile Qt applications using GCCE by linking to these
+precompiled binaries. For more information on this issue see:
+http://www3.symbian.com/faq.nsf/0/B8542F039C193CCC802573DA0011DFA7
+
+HOW TO REPORT A BUG
+
+We have set up a special mailinglist for feedback on the S60 port.
+Bug-reports, feedback or questions all go to this list.
+Please go to http://pepper.troll.no/s60prereleases/ 
+for details on how to subscribe to the list.
+
+Before posting, please consult the FAQ and the list of known issues:
+http://labs.trolltech.com/page/QtforS60FAQ
+http://labs.trolltech.com/page/QtforS60KnownIssues
+
+Always include the following information in your bug report: the name
+and version number of your compiler; the name and version number of
+your operating system; the version of Qt you are using, and what
+configure options it was compiled with.
+
+If the problem you are reporting is only visible at run-time, try to
+create a small test program that shows the problem when run. Often,
+such a program can be created with some minor changes to one of the
+many example programs in Qt's examples directory.
+
+
+                   INSTALLING Qt/S60 Version %VERSION%
+
+1.  Install needed IDE and SDKs
+
+    Make sure you have the following installed:
+
+    - Carbide.c++ v2.0.0 or higher: 
+      http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/
+
+      Note: It may be necessary to update the Carbide compiler. 
+            See http://pepper.troll.no/s60prereleases/patches/ for instructions 
+            how to check your compiler version and how to patch it, if needed.
+
+    - S60 Platform SDK 3rd Edition FP1 or higher: 
+      http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/
+
+    - Open C/C++ v1.6.0 or higher. Install this to all S60 SDKs you plan to use Qt with:
+      http://www.forum.nokia.com/main/resources/technologies/openc_cpp/
+
+    - Building Qt libraries for real device requires RVCT 2.2 [build 616] or later:
+      http://www.arm.com/products/DevTools/RVCT.html
+
+    Make sure you have the following packages installed on any device you want to use to
+    run Qt applications. These packages can be found under nokia_plugin directory in any 
+    S60 SDK where you have installed Open C/C++:
+
+    - nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis
+    - nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis
+    - nokia_plugin\opencpp\s60opencppsis\stdcpp_s60_<version>.sis
+
+    These instructions assume the above tools are installed and
+    that the enviroment variables for your compiler are set correctly.
+
+    Note: Users of S60 Platform SDK 3rd Edition FP1 also need special updates:
+          http://pepper.troll.no/s60prereleases/patches/
+
+2.  Install Qt
+
+    Uncompress the package into the directory you want Qt installed,
+    e.g. C:\Qt\%VERSION%. 
+
+    Note: Qt must be installed on the same drive as the S60 SDK you are
+    using, and the install path must not contain any whitespaces.
+
+3.  Environment variables
+
+    In order to build and use Qt, the PATH environment variable needs
+    to be extended:
+
+        PATH               - to locate qmake, moc and other Qt tools
+
+    This is done by adding c:\Qt\%VERSION%\bin to the PATH variable.
+
+    On Windows the PATH can be extended by navigating to
+    "Control Panel->System->Advanced->Environment variables".
+
+    In addition, you must configure the environment for use with the S60
+    emulator. This is done by locating the Carbide.c++ submenu on the Start
+    menu, and choosing "Configure environment for WINSCW command line".
+
+4.  Configure Qt
+
+    To configure Qt for S60, do:
+
+        cd \Qt\%VERSION%
+        configure -platform win32-mwc -xplatform symbian-abld
+
+    For other options, type "configure -help" to get a list of all available
+    options.
+
+5.  Build Qt
+
+    To build Qt for the device, type:
+
+        make release-armv5
+
+    To build Qt for the emulator, type:
+
+        make debug-winscw
+
+    Congratulations, Qt is now ready to use.
+
+6.  Running Qt demos
+
+    We've included a subset of the Qt demos in this package for you to try out. 
+    An excellent starting point is the "fluidlauncher" demo. To run the demo on 
+    a real device, you first have to install the Qt libraries on the device:
+
+        cd src\s60installs
+        createpackage -i qt_libs_armv5_urel.pkg <certificate file> <certificate key file>
+
+    Note: You will need to supply certificate that allows installation of 
+          binaries with "All -Tcb" capability to your device.
+
+    Similarly, install fluidlauncher to the device:
+
+        cd embedded\fluidlauncher
+        createpackage -i fluidlauncher_armv5_urel.pkg
+
+    This will create a self-signed fluidlauncher_armv5_urel.sisx and install it to your device.
+
+    To run the demos on the emulator simply navigate to the directory of the demo and run:
+
+        make run
+
+    Or, if you need to supply arguments to the program, navigate to 
+    %EPOCROOT%\Epoc32\release\winscw\udeb\ and start any of the Qt demos located there,
+    for example:
+
+        wiggly.exe -small-screen
+
+    We hope you will enjoy using Qt.

README.wince

@@ -0,0 +1,44 @@
+                      Signing on Windows CE.
+
+Windows CE provides a security mechanism to ask the user to confirm
+that he wants to use an application/library, which is unknown to the
+system. This process gets repeated for each dependency of an 
+application, meaning each library the application links to, which is
+not recognized yet.
+
+To simplify this process you can use signatures and certificates. A 
+certificate gets installed on the device and each file which is
+signed with the according certificate can be launched without the
+security warning.
+
+In case you want to use signatures for your project written in Qt,
+configure provides the -signature option. You need to specify the
+location of the .pfx file and qmake adds the signing step to the
+build rules.
+
+If you need to select a separate signature for a specific project,
+or you only want to sign this single project, you can use the 
+"SIGNATURE_FILE = foo.pfx" rule inside the project file.
+
+The above decribed rules apply for command line makefiles as well as
+Visual Studio projects generated by qmake.
+
+Microsoft usually ships development signatures inside the SDK packages.
+You can find them in the Tools subdirectory of the SDK root folder.
+
+Example:
+
+1. calling configure with signing enabled:
+configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
+-signature C:\some\path\SDKSamplePrivDeveloper.pfx
+
+2. using pro file to specify signature
+[inside .pro file]
+...
+TARGET = foo
+
+wince*: {
+   SIGNATURE_FILE = somepath\customSignature.pfx
+}
+...
+

bin/createpackage.pl

@@ -146,9 +146,9 @@ ()
 my $scriptpath = dirname(__FILE__);
 my $certtext = $certificate;
 my $certpath = $scriptpath;
-$certpath =~ s-^(.*[^\\])$-$1\\-o;      # ensure path ends with a backslash
-$certpath = $certpath."../";            # certificates are one step up in hierarcy
-$certpath =~ s-/-\\-go;	                # for those working with UNIX shells
+$certpath =~ s-^(.*[^\\])$-$1\\-o;          # ensure path ends with a backslash
+$certpath =~ s-/-\\-go;                     # for those working with UNIX shells
+$certpath =~ s-bin\\$-src\\s60installs\\-;  # certificates are one step up in hierarcy
 
 # Check some pre-conditions and print error messages if needed
 unless (length($templatepkg) && length($platform) && length($target)) {