Merge branch '4.6'

Conflicts: src/plugins/qpluginbase.pri tests/benchmarks/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp tools/assistant/compat/mainwindow.cpp tools/assistant/compat/mainwindow.ui tools/assistant/tools/assistant/doc/assistant.qdocconf
radekp · Sep 3, 2009 · 0b9aa36 · 0b9aa36
2 parents 714e0f1 + d4a4b01
commit 0b9aa36
Show file tree

Hide file tree

Showing 380 changed files with 8,970 additions and 2,598 deletions.
diff --git a/.gitignore b/.gitignore
@@ -198,6 +198,7 @@ plugin_commonU.def
 # ---------------------
 .project
 .cproject
+.make.cache
 
 qtc-debugging-helper
 src/corelib/lib

diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
@@ -13,7 +13,7 @@ ()
     print("If no capabilities are given, the binaries will be given the\n");
     print("capabilities supported by self-signed certificates.\n");
     print("\nUsage: patch_capabilities.pl pkg_filename [target-platform] [capability list]\n");
-    print("    If template .pkg file is given, next agrument must be 'target-platform'.\n");    
+    print("    If template .pkg file is given, next agrument must be 'target-platform'.\n");
     print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv5 \"All -TCB\"\n");
     exit();
 }
@@ -26,17 +26,26 @@ ()
     # Parse the first given script argument as a ".pkg" file name.
     my $pkgFileName = shift(@ARGV);
 
-    # Check if using template .pkg and do preprocessing if needed
-    if (($pkgFileName =~ m|_template\.pkg$|i) && -r($pkgFileName)) 
+    # These variables will only be set for template .pkg files.
+    my $target;
+    my $platform;
+
+    # Check if using template .pkg and set target/platform variables
+    if (($pkgFileName =~ m|_template\.pkg$|i) && -r($pkgFileName))
     {
-        my $target;
-        unless ($target = shift(@ARGV)) 
+        my $targetplatform;
+        unless ($targetplatform = shift(@ARGV))
         {
             Usage();
         }
-
-        system ("createpackage.bat -p ".$pkgFileName." ".$target);   
-        $pkgFileName =~ s/_template\.pkg/_${target}\.pkg/;
+
+        my @tmpvalues = split('-', $targetplatform);
+        $target = $tmpvalues[0];
+        $platform = $tmpvalues[1];
+
+        # Convert visual target to real target (debug->udeb and release->urel)
+        $target =~ s/debug/udeb/i;
+        $target =~ s/release/urel/i;
     }
 
     # If the specified ".pkg" file exists (and can be read),
@@ -80,8 +89,16 @@ ()
                 my $destinationPath = $2;
 
                 # If the given file is a binary, check the target and binary type (+ the actual filename) from its path.
-                if ($sourcePath =~ m:/epoc32/release/([^/]+)/(udeb|urel)/(\w+(\.dll|\.exe)):i)
+                if ($sourcePath =~ m:/epoc32/release/([^/]+)/(udeb|urel|\$\(TARGET\))/(\w+(\.dll|\.exe)):i)
                 {
+                    # Do preprocessing for template pkg,
+                    # In case of template pkg target and platform variables are set
+                    if(length($target) && length($platform))
+                    {
+                        $sourcePath =~ s/\$\(PLATFORM\)/$platform/gm;
+                        $sourcePath =~ s/\$\(TARGET\)/$target/gm;
+                    }
+
                     push (@binaries, $sourcePath);
                 }
             }

diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat
@@ -1,3 +1,43 @@
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: 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$
+::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 @echo off
 IF "%1" EQU "wincewm50pocket-msvc2005" (
 checksdk.exe -sdk "Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL

diff --git a/bin/syncqt.bat b/bin/syncqt.bat
@@ -1,2 +1,42 @@
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: 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$
+::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 @rem ***** This assumes PERL is in the PATH *****
 @perl.exe -S syncqt %*
diff --git a/configure b/configure
@@ -1,13 +1,44 @@
 #!/bin/sh
-#
-# Configures to build the Qt library
-#
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# Contact: Nokia Corporation (qt-info@nokia.com)
-#
-# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility 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$
+##
+#############################################################################
 
 #-------------------------------------------------------------------------------
 # script initialization
@@ -643,7 +674,7 @@ CFG_MULTIMEDIA=yes
 CFG_SVG=yes
 CFG_WEBKIT=auto # (yes|no|auto)
 
-CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen"
+CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb"
 CFG_GFX_ON="linuxfb multiscreen"
 CFG_GFX_PLUGIN_AVAILABLE=
 CFG_GFX_PLUGIN=

diff --git a/demos/boxes/qtbox.cpp b/demos/boxes/qtbox.cpp
@@ -319,6 +319,8 @@ void QtBox::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWi
         0.5f * (right + left), 0.5f * (bottom + top), 0.0f, 1.0f
     };
 
+    painter->beginNativePainting();
+
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
     glLoadMatrixf(moveToRectMatrix);
@@ -392,6 +394,8 @@ void QtBox::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWi
     glMatrixMode(GL_PROJECTION);
     glPopMatrix();
 
+    painter->endNativePainting();
+
     ItemBase::paint(painter, option, widget);
 }
 

diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
@@ -894,6 +894,7 @@ void Scene::drawBackground(QPainter *painter, const QRectF &)
     float width = float(painter->device()->width());
     float height = float(painter->device()->height());
 
+    painter->beginNativePainting();
     setStates();
 
     if (m_dynamicCubemap)
@@ -913,6 +914,8 @@ void Scene::drawBackground(QPainter *painter, const QRectF &)
 
     defaultStates();
     ++m_frame;
+
+    painter->endNativePainting();
 }
 
 QPointF Scene::pixelPosToViewPos(const QPointF& p)

diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp
@@ -377,7 +377,9 @@ void CompositionRenderer::paint(QPainter *painter)
             p.setCompositionMode(QPainter::CompositionMode_Source);
             p.fillRect(QRect(0, 0, m_pbuffer->width(), m_pbuffer->height()), Qt::transparent);
 
-            p.save();
+            p.save(); // Needed when using the GL1 engine
+            p.beginNativePainting(); // Needed when using the GL2 engine
+
             glBindTexture(GL_TEXTURE_2D, m_base_tex);
             glEnable(GL_TEXTURE_2D);
             glColor4f(1.,1.,1.,1.);
@@ -399,16 +401,21 @@ void CompositionRenderer::paint(QPainter *painter)
             glEnd();
 
             glDisable(GL_TEXTURE_2D);
-            p.restore();
+
+            p.endNativePainting(); // Needed when using the GL2 engine
+            p.restore(); // Needed when using the GL1 engine
 
             drawSource(p);
             p.end();
             m_pbuffer->updateDynamicTexture(m_compositing_tex);
         }
 
-        glWidget()->makeCurrent();
+        painter->beginNativePainting(); // Needed when using the GL2 engine
+        glWidget()->makeCurrent(); // Needed when using the GL1 engine
         glBindTexture(GL_TEXTURE_2D, m_compositing_tex);
         glEnable(GL_TEXTURE_2D);
+        glEnable(GL_BLEND);
+        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
         glColor4f(1.,1.,1.,1.);
         glBegin(GL_QUADS);
         {
@@ -426,6 +433,7 @@ void CompositionRenderer::paint(QPainter *painter)
         }
         glEnd();
         glDisable(GL_TEXTURE_2D);
+        painter->endNativePainting(); // Needed when using the GL2 engine
     } else
 #endif
     {

diff --git a/demos/textedit/textedit.doc b/demos/textedit/textedit.doc
diff --git a/mkspecs/common/symbian/fixed_stdlib.h → demos/textedit/textedit.qdoc b/mkspecs/common/symbian/fixed_stdlib.h → demos/textedit/textedit.qdoc
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the makespecs of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,26 +39,21 @@
 **
 ****************************************************************************/
 
-#ifndef FIXED_STDLIB_H
-#define FIXED_STDLIB_H
+/*!   \page textedit-example.html
 
-// This hack fixes defect in Symbian stdlib.h. The original file
-// does not work correctly when intermixing C and C++ (STL). Remove the hack
-// when Open C / C++ team has fixed the defect.
+  \ingroup examples
+  \title Text Edit Example
 
-// If _WCHAR_T_DECLARED is defined, undef it and store information that we
-// need to revert the _WCHAR_T_DECLARED define after include
-#   ifdef _WCHAR_T_DECLARED
-#       define QT_REVERT_WCHAR_T_DECLARED
-#       undef _WCHAR_T_DECLARED
-#   endif //_WCHAR_T_DECLARED
+  This example displays a text editor with the user interface written
+  in pure C++. 
+  
+  A similar example which uses \link designer-manual.book Qt
+  Designer\endlink to produce the user interface is in the \link
+  designer-manual.book Qt Designer manual\endlink.
 
-#include <stdlib.h>
 
-// Revert _WCHAR_T_DECLARED if necessary
-#   ifdef QT_REVERT_WCHAR_T_DECLARED
-#       define _WCHAR_T_DECLARED
-#       undef QT_REVERT_WCHAR_T_DECLARED
-#   endif //QT_REVERT_WCHAR_T_DECLARED
+  See \c{$QTDIR/examples/textedit} for the source code.
+
+*/
+
 
-#endif
diff --git a/doc/src/examples/complexpingpong.qdoc b/doc/src/examples/complexpingpong.qdoc
@@ -46,5 +46,5 @@
     The Complex Ping Pong example improves on the \l{D-Bus Ping Pong Example} by providing
     a more useful demonstration of D-Bus interfaces.
 
-    \quotefile doc/src/snippets/complexpingpong-example.qdoc
+    \quotefile doc/src/snippets/complexpingpong-example.txt
 */