Merge "Merge branch 'release' into stable" into refs/staging/stable

.gitattributes

@@ -4,3 +4,4 @@
 .gitmodules             export-ignore
 .commit-template        export-ignore
 init-repository         export-ignore
+README.git              export-ignore

LGPL_EXCEPTION.txt

@@ -0,0 +1,22 @@
+Digia Qt LGPL Exception version 1.1
+
+As an additional permission to the GNU Lesser General Public License version
+2.1, the object code form of a "work that uses the Library" may incorporate
+material from a header file that is part of the Library.  You may distribute
+such object code under terms of your choice, provided that:
+    (i)   the header files of the Library have not been modified; and 
+    (ii)  the incorporated material is limited to numerical parameters, data
+          structure layouts, accessors, macros, inline functions and
+          templates; and
+    (iii) you comply with the terms of Section 6 of the GNU Lesser General
+          Public License version 2.1.
+
+Moreover, you may apply this exception to a modified version of the Library,
+provided that such modification does not involve copying material from the
+Library into the modified Library's header files unless such material is
+limited to (i) numerical parameters; (ii) data structure layouts;
+(iii) accessors; and (iv) small macros, templates and inline functions of
+five lines or less in length.
+
+Furthermore, you are not required to apply this additional permission to a
+modified version of the Library.

README

@@ -122,3 +122,22 @@ HOW TO BUILD QT5
  See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git
  for more information.
  See http://qt-project.org/wiki/Qt-5 for the reference platforms.
+
+
+ Documentation
+ =============
+
+ After the configure step, building the documentation is possible by running
+ "make docs".
+ Example:
+
+    ./configure -prefix $PWD/qtbase -opensource
+    make docs
+
+ The documentation is installed in the path set to $QT_INSTALL_DOCS.
+ Running "qmake -query" will list the value of QT_INSTALL_DOCS.
+
+ Information about Qt 5's documentation is located in qtbase/doc/README
+ or in the following page: http://qt-project.org/wiki/Qt5DocumentationProject
+
+ Note: Building the documentation is only tested on desktop platforms.

configure

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#! /bin/sh
 #############################################################################
 ##
 ## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
@@ -40,61 +40,23 @@
 ##
 #############################################################################
 
-####################################################################################################
-#
-# Mother script for Qt Modularization
-#
-####################################################################################################
+srcpath=`dirname $0`
+configure=$srcpath/qtbase/configure
+if [ ! -e "$configure" ]; then
+    echo "$configure not found. Did you forget to run \"init-repository\"?" >&2
+    exit 1
+fi
 
-use strict;
-use warnings;
+mkdir -p qtbase || exit
 
-use File::Basename;
-use File::Path;
-use Cwd;
-use Cwd 'abs_path';
-use Config;
+echo "+ cd qtbase"
+cd qtbase || exit
 
-# Makes sure the arguments are directories, and creates them if not.
-# Will die if there is an error.
-sub ensureDir {
-    foreach (@_) {
-        if (-e $_) {
-            if (-d $_) {
-                next;
-            } else {
-                die ("$_ exists, but is not a directory");
-            }
-        }
-        File::Path::mkpath($_) or die("Could not create $_");
-    }
-}
+echo "+ $configure $@"
+"$configure" "$@" || exit 1
 
-# `system', but also print the command
-sub system_v
-{
-    print "+ @_\n";
-    return system(@_);
-}
+echo "+ cd .."
+cd ..
 
-my $relpath = dirname(abs_path($0));
-$relpath =~ s,\\,/,g;
-# the current directory is the "build tree" or "object tree"
-my $outpath = getcwd();
-
-if (! -e "$relpath/qtbase/configure") {
-    die("$relpath/qtbase/configure not found. Did you forget to run \"init-repository\"?");
-}
-
-ensureDir("$outpath/qtbase");
-chdir("$outpath/qtbase");
-my $ret = system_v("$relpath/qtbase/configure", @ARGV);
-if ($ret != 0) {
-    print "*** qtbase/configure exited with non-zero status.\n";
-    exit ($ret>>8) ;
-}
-
-chdir("$outpath");
-
-$ret = system_v("$outpath/qtbase/bin/qmake", "$relpath/qt.pro");
-exit ($ret>>8);
+echo "+ qtbase/bin/qmake $srcpath"
+exec qtbase/bin/qmake "$srcpath"

configure.bat

@@ -1,3 +1,4 @@
+@echo off
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
 :: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
@@ -38,5 +39,30 @@
 :: $QT_END_LICENSE$
 ::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-@rem ***** This assumes PERL is in the PATH *****
-@perl.exe %~dp0configure %*
+
+set "srcpath=%~dp0"
+set "configure=%srcpath%qtbase\configure.bat"
+if not exist "%configure%" (
+    echo %configure% not found. Did you forget to run "init-repository"? >&2
+    exit /b 1
+)
+
+if not exist qtbase mkdir qtbase || exit /b 1
+
+echo + cd qtbase
+cd qtbase || exit /b 1
+
+echo + %configure% %*
+call %configure% %*
+set err=%errorlevel%
+
+cd ..
+
+if not %err% == 0 goto out
+
+echo + qtbase\bin\qmake %srcpath%
+qtbase\bin\qmake %srcpath%
+set err=%errorlevel%
+
+:out
+exit /b %err%