Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
	configure.exe

4 files changed, 33 insertions, 33 deletions

diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index eec0492..b5dc03d 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -706,6 +706,7 @@
     \o \l{tools/customtypesending}{Custom Type Sending}\raisedaster
     \o \l{tools/echoplugin}{Echo Plugin}\raisedaster
     \o \l{tools/i18n}{I18N}
+    \o \l{tools/inputpanel}{Input Panel}\raisedaster
     \o \l{tools/plugandpaint}{Plug & Paint}\raisedaster
     \o Plug & Paint Plugins: \l{tools/plugandpaintplugins/basictools}{Basic Tools}\raisedaster
        and \l{tools/plugandpaintplugins/extrafilters}{Extra Filters}\raisedaster
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index 0b63423..5c8888d 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -59,34 +59,6 @@
 
     \section1 Installation Issues
 
-    \section2 Building the Source Package on Windows 7
-
-    \list
-    \o  When building Qt 4.5.0 with Windows 7, the build fails with an error
-        message regarding failing to embed manifest. This a known issue with
-        Windows 7, explained in the Windows 7 SDK Beta
-        \l{http://download.microsoft.com/download/8/8/0/8808A472-6450-4723-9C87-977069714B27/ReleaseNotes.Htm}
-        {release notes}. A workaround for this issue is to patch the
-        \bold{embed_manifest_exe.prf} file with the following:
-
-        \code
-        diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf
-        index e1747f1..05f116e 100644
-        --- a/mkspecs/features/win32/embed_manifest_exe.prf
-        +++ b/mkspecs/features/win32/embed_manifest_exe.prf
-        @@ -8,4 +8,9 @@ if(win32-msvc2005|win32-msvc2008):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE
-             QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(OBJECTS_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.ma
-        nifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\n\t))
-             QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK
-             QMAKE_CLEAN += \"$$replace(OBJECTS_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"
-        +    isEmpty(RC_FILE) {
-        +        system("echo.>$$replace(OUT_PWD,/,\\)\\$$replace(OBJECTS_DIR,/,\\)\\Windows7WorkAround.rc")
-        +        RC_FILE = $$replace(OUT_PWD,/,\\)\\$$replace(OBJECTS_DIR,/,\\)\\Windows7WorkAround.rc
-        +       }
-        +
-         }
-        \endcode
-
     \section2 Installing the Source Package on Unix systems
 
     \o  If you download a Zip source package, you will need to convert
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 3abcf7c..ef29990 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -316,6 +316,37 @@
 
 	The QtScript module is part of the \l{Qt Full Framework Edition} and the
 	\l{Open Source Versions of Qt}.
+
+        \section1 License Information
+
+        Qt Commercial Edition licensees that wish to distribute applications that
+        use the QtScript module need to be aware of their obligations under the
+        GNU Library General Public License (LGPL).
+
+        Developers using the Open Source Edition can choose to redistribute
+        the module under the appropriate version of the GNU LGPL.
+
+        \legalese
+        QtScript is licensed under the GNU Library General Public License.
+        Individual contributor names and copyright dates can be found
+        inline in the code.
+
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Library General Public
+        License as published by the Free Software Foundation; either
+        version 2 of the License, or (at your option) any later version.
+
+        This library is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+        Library General Public License for more details.
+
+        You should have received a copy of the GNU Library General Public License
+        along with this library; see the file COPYING.LIB.  If not, write to
+        the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+        Boston, MA 02110-1301, USA.
+        \endlegalese
+
 */
 
 /*!
diff --git a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp b/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp
index fb1f363..ea42e70 100644
--- a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp
+++ b/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp
@@ -41,19 +41,15 @@
 
 //! [0]
 QRegion r1(10, 10, 20, 20);
-r1.isNull();                // false
 r1.isEmpty();               // false
 
-QRegion r2(40, 40, 20, 20);
 QRegion r3;
-r3.isNull();                // true
 r3.isEmpty();               // true
 
+QRegion r2(40, 40, 20, 20);
 r3 = r1.intersected(r2);    // r3: intersection of r1 and r2
-r3.isNull();                // false
 r3.isEmpty();               // true
 
 r3 = r1.united(r2);         // r3: union of r1 and r2
-r3.isNull();                // false
 r3.isEmpty();               // false
 //! [0]