Merge remote-tracking branch 'origin/2.4'

Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:01 +01:00
parent 920ed1140e d099d6856e
commit 85cf2b661e
3971 changed files with 17179 additions and 13395 deletions
@@ -10,12 +10,12 @@ Windows 7, Windows XP SP2, Windows Vista
 (K)Ubuntu Linux 8.04 (32-bit and 64-bit) or later
 Mac OS 10.5 or later

-Building the sources requires Qt 4.7.1 or later.
+Building the sources requires Qt 4.7.4 or later.

 Compiling Qt Creator
 ====================
 Prerequisites:
-   * Qt 4.7.1
+   * Qt 4.7.4
   * On Windows:
     -  ActiveState Active Perl (version 5.8.9 for Symbian development)
     -  MinGW 4.4 or later, Visual Studio 2008 or later
@@ -36,7 +36,7 @@ Compiling Qt Quick Designer
 ---------------------------

 Qt Quick Designer (QmlDesigner plugin) depends on "private" headers from Qt
-4.7.1, specifically from the QtDeclarative module. These private headers always
+4.7.4, specifically from the QtDeclarative module. These private headers always
 end with an "_p.h". Nokia does not promise to keep these files or APIs binary
 or source compatible between releases. This means that when compiled, the
 plugin has a dependency to the exact Qt version it was compiled with. Running
@@ -277,7 +277,7 @@ we thank the authors who made this possible:
  All rights reserved.
  Copyright (c) 2010 Denis Mingulov.

-  Contact: Nokia Corporation (info@qt.nokia.com)
+  Contact: Nokia Corporation (qt-info@nokia.com)

  This file is part of Qt Creator.

@@ -8,50 +8,51 @@ git clone git://gitorious.org/qt-creator/qt-creator.git
 git log --cherry-pick --pretty=oneline v2.3.1...origin/2.4

 General
-   * Showing more useful error dialog in case of plugin errors
-   * Reduce minimum size of preferences dialog
+   * Improve the error message that appears when plugin errors occur
+   * Decrease the minimum size of the Options dialog

 Editing
   * Advanced search: Show more information about the search parameters
-   * Advanced search: Move the previously modal dialog into search results pane
-   * Advanced search: Keep a history of most recent searches and their results
-   * Code Style schemas implemented, you can reuse them in different projects now
+   * Advanced search: Move the previously modal dialog into the search results pane
+   * Advanced search: Keep a history of the most recent searches and their results
+   * Implement code style schemas for reuse in different projects

 Managing Projects
-   * Shared project settings support
-   * New templates for non-Qt C and C++ applications
+   * Support the sharing of project settings
+   * Add new project wizards for non-Qt C and C++ applications

 Debugging
-   * Initial Qt 5 support in dumpers
+   * Add initial Qt 5 support in dumpers
   * Make vtables visible
-   * Improved remote debugging
-   * Improved register handling (partial updates, input in hex, ARM Neon support)
+   * Improve remote debugging
+   * Improve register handling (partial updates, input in hex, ARM Neon support)
   * Remove inferior calls in QDate, QTime, QDateTime dumpers
   * Fix QTextCodec dumpers
   * Globally enable pretty printing for references
-   * Saner handling of unprintable data in Locals and Expressions
-   * Add "Local8Bit" as display option for char arrays and pointers
+   * Improve handling of unprintable data in Locals and Expressions
+   * Add 'Local8Bit' as a display option for char arrays and pointers

 Debugging QML/JS
-   * New option to attach to a running application
+   * Add the option to attach to a running application
   * Lots of bug fixes especially for debugging in combination with C++
-   * Initial support for debugging JS in Qt 5 (v8 engine)
+   * Add initial support for debugging JS in Qt 5 (v8 engine)

 Analyzing Code
-   * Standalone qmlprofiler command line tool allows you to retrieve & store QML tracing data
-   * Ability to store and load traces in a file
-   * New option to attach to a running application
+   * Retrieve and store QML tracing data by using the standalone qmlprofiler
+     command line tool
+   * Store and load traces in a file
+   * Add the option to attach to a running application

 C++ Support
-   * Add quick fix to synchronize function declarations and definitions
+   * Add the refactoring action to synchronize function declarations and definitions
   * Make 'insert definition from declaration' use minimally qualified names
     and find a good insertion location next to surrounding declarations
   * Fix completion for typedefs for templates in namespaces
   * Use minimally qualified names in function signature completion
-   * Use minimally qualified names in 'insert local declaration' quick fix
-   * When switching between header/source, prefer files in the same directory
-   * Fix problem with encoding and quick fixes (QTCREATORBUG-6140)
-   * Fix preservation of indentation level in comments with tabs (QTCREATORBUG-6151)
+   * Use minimally qualified names in 'insert local declaration' refactoring action
+   * Prefer files in the same directory when switching between the header and source
+   * Fix the problem with encoding and quick fixes (QTCREATORBUG-6140)
+   * Fix the preservation of indentation level in comments with tabs (QTCREATORBUG-6151)
   * Improve performance for files with a huge number of literals

 QML/JS Support
@@ -60,22 +61,22 @@ QML/JS Support
   * Add semantic highlighting
   * Significantly improve scanning of C++ documents for qmlRegisterType and
     setContextProperty calls (QTCREATORBUG-3199)
-   * Add warning about inappropriate use of constructor functions
-   * Add warning about unreachable code
+   * Add a warning about inappropriate use of constructor functions
+   * Add a warning about unreachable code
   * Add support for .import directive in js files
   * Add completion for XMLHttpRequest, DB API and JSON.
-   * Add 'length' property to functions
+   * Add the 'length' property to functions
   * Use mime types to distinguish qml and js files
   * Show the function argument hint for signals
   * When completing enums, add qualified names instead of strings
   * Honor typeinfo lines in qmldir files
   * Make string literals that contain file names into links (QTCREATORBUG-5701)
-   * Add warning about invalid types in 'property' declarations (QTCREATORBUG-3666)
-   * Fix highlighting of property types (QTCREATORBUG-6127)
-   * Fix 'follow symbol' for local variables (QTCREATORBUG-6094)
+   * Add a warning about invalid types in 'property' declarations (QTCREATORBUG-3666)
+   * Fix the highlighting of property types (QTCREATORBUG-6127)
+   * Fix the 'follow symbol' functionality for local variables (QTCREATORBUG-6094)
   * Fix function argument hints on variables (QTCREATORBUG-5752)
-   * Fix completion for enums in a different scope
-   * Fix typing '/' triggering a global completion
+   * Fix the completion for enums in a different scope
+   * Fix typing a slash (/) triggering a global completion
   * Fix handling of meta object revision in C++ QML plugins
   * Fix indentation of block property initializers
   * Fix indentation of labelled statements
@@ -85,40 +86,40 @@ QML/JS Support
   * Use qmlscene for previewing files in Qt 5

 Qt Quick Designer
-   * Adding breadcrumb navigation for components
-   * Adding layout functionality to context menu.
+   * Add breadcrumb navigation for components
+   * Add layout functionality to context menu

 Help

 Platform Specific

 Mac
-   * "Run in Terminal" was not finding xterm by default
+* Fix 'Run in Terminal' so that it finds xterm by default

 Linux (GNOME and KDE)

 Windows
-   * Aborting the build now works properly. Qt Creator sends Ctrl-C to the
-     build process via the process_ctrlc_stub helper program.
+   * Fix aborting the build, so that Qt Creator sends Ctrl-C to the
+     build process via the process_ctrlc_stub helper program

 Symbian Target

 Remote Linux Support
-   * Move Maemo/MeeGo support into its own plugin.
-   * Assume less about the target systems, e.g. in respect to the presence of
-     POSIX-conforming tools.
+   * Move Maemo and MeeGo support into its own plugin
+   * Assume less about the target systems, for example, in respect to the
+     presence of POSIX-conforming tools.

 Qt Designer

 FakeVim
   * Add basic command editing in Ex mode
-   * Mention "comma escape" in Documentation
-   * Fix foreground color for search matches in Dark scheme
-   * Fix toggling visual mode with "v"
+   * Mention 'comma escape' in the documentation
+   * Fix foreground color for search hits in the Dark scheme
+   * Fix toggling visual mode with 'v'

 Version control plugins
   * SVN: Support for SVN version 1.7
-   * Git: New option to toggle decoration settings for log and show commands
+   * Git: Add an option to toggle decoration settings for log and show commands


 Additional credits go to:
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 **
 ** GNU Lesser General Public License Usage
@@ -26,7 +26,7 @@
 ** conditions contained in a signed written agreement between you and Nokia.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/

@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 **
 ** GNU Free Documentation License
@@ -15,7 +15,7 @@
 ** file.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/

@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 **
 ** GNU Free Documentation License
@@ -15,7 +15,7 @@
 ** file.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 ****************************************************************************/

@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 **
 ** GNU Free Documentation License
@@ -15,7 +15,7 @@
 ** file.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 ****************************************************************************/

@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 **
 ** GNU Free Documentation License
@@ -15,7 +15,7 @@
 ** file.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 ****************************************************************************/

@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 **
 ** GNU Free Documentation License
@@ -15,7 +15,7 @@
 ** file.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 ****************************************************************************/

@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 **
 ** GNU Free Documentation License
@@ -15,7 +15,7 @@
 ** file.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 ****************************************************************************/

@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 **
 ** GNU Free Documentation License
@@ -15,7 +15,7 @@
 ** file.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 ****************************************************************************/

@@ -2,7 +2,7 @@ project     = "Qt Creator"
 description = "Qt Creator Manual"

 headerdirs = 
-sourcedirs = $SRCDIR/src $SRCDIR/src
+sourcedirs = $SRCDIR/src
 imagedirs = $SRCDIR/images $SRCDIR/templates/images
 outputdir = $OUTDIR
 exampledirs = $SRCDIR
@@ -82,6 +82,5 @@ OTHER_FILES = $$HELP_DEP_FILES $$DEV_HELP_DEP_FILES

 fixnavi.commands = \
    cd $$targetPath($$PWD) && \
-    perl fixnavi.pl -Dqcmanual -Dqtquick \
-        qtcreator.qdoc maemodev.qdoc symbiandev.qdoc qtcreator-faq.qdoc linuxdev.qdoc meegodev.qdoc
+    perl fixnavi.pl -Dqcmanual -Dqtquick src
 QMAKE_EXTRA_TARGETS += fixnavi
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -1,7 +1,7 @@

 # Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
-# Contact: Nokia Corporation (info@qt.nokia.com)
+# Contact: Nokia Corporation (qt-info@nokia.com)
 #
 # This file is part of the documentation of Qt Creator.
 #
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 **
 ** GNU Free Documentation License
@@ -15,7 +15,7 @@
 ** file.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 ****************************************************************************/

@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
@@ -1,7 +1,27 @@
-#! /usr/bin/perl -w
+#! /usr/bin/perl

+use warnings;
 use strict;

+sub visitDir($)
+{
+    my ($dir) = @_;
+    my @ret = ();
+    my @subret = ();
+    opendir DIR, $dir or die "$dir: $!\n";
+    my @ents = readdir DIR;
+    closedir DIR;
+    for my $ent (grep !/^\./, @ents) {
+        my $ret = $dir."/".$ent;
+        if (-d $ret) {
+            push @subret, &visitDir($ret);
+        } elsif ($ret =~ /\.qdoc$/) {
+            push @ret, $ret;
+        }
+    }
+    return @ret, @subret;
+}
+
 my @files = ();
 my %defines = ();
 for (@ARGV) {
@@ -11,42 +31,52 @@ for (@ARGV) {
        printf STDERR "Unknown option '".$_."'\n";
        exit 1;
    } else {
-        push @files, $_;
+        if (-d $_) {
+            push @files, visitDir($_);
+        } else {
+            push @files, $_;
+        }
    }
 }

-int(@files) or die "usage: $0 [-D<define>]... <qdoc-file>\n";
+int(@files) or die "usage: $0 [-D<define>]... <qdoc-file>...\n";

 my @toc = ();
 my %title2page = ();
 my $doctitle = "";
-my $curpage = "";
-my $intoc = 0;
 my %prev_skips = ();
 my %next_skips = ();
 my %define_skips = ();
 my %polarity_skips = ();
-my $prev_skip = "";
-my $next_skip = "";
-my $define_skip = "";
-my $polarity_skip = 0;
 for my $file (@files) {
-    my $skipping = 0; # no nested ifs!
+    my ($curpage, $inhdr, $intoc, $inif) = ("", 0, 0, 0);
+    my ($define_skip, $polarity_skip, $skipping, $prev_skip, $next_skip) = ("", 0, 0, "", "");
    open FILE, $file or die "File $file cannot be opened.\n";
    while (<FILE>) {
        if (/^\h*\\if\h+defined\h*\(\h*(\H+)\h*\)/) {
+            die "Nested \\if at $file:$.\n" if ($inif);
+            $inif = 1;
            $skipping = !defined($defines{$1});
-            if (!$intoc) {
+            if ($inhdr) {
                $define_skip = $1;
                $polarity_skip = $skipping;
            }
        } elsif (/^\h*\\else/) {
+            die "Unmatched \\else in $file:$.\n" if (!$inif);
            $skipping = 1 - $skipping;
        } elsif (/^\h*\\endif/) {
+            die "Unmatched \\endif in $file:$.\n" if (!$inif);
+            $inif = 0;
            $skipping = 0;
        } elsif (keys(%title2page) == 1 && /^\h*\\list/) {
            $intoc++;
-        } elsif (!$intoc) {
+        } elsif ($intoc) {
+            if (/^\h*\\endlist/) {
+                $intoc--;
+            } elsif (!$skipping && /^\h*\\o\h+\\l\h*{(.*)}$/) {
+                push @toc, $1;
+            }
+        } elsif ($inhdr) {
            if ($skipping && /^\h*\\previouspage\h+(\H+)/) {
                $prev_skip = $1;
            } elsif ($skipping && /^\h*\\nextpage\h+(\H+)/) {
@@ -67,15 +97,16 @@ for my $file (@files) {
                $title2page{$1} = $curpage;
                $doctitle = $1 if (!$doctitle);
                $curpage = "";
+                $inhdr = 0;
            }
        } else {
-            if (/^\h*\\endlist/) {
-                $intoc--;
-            } elsif (!$skipping && /^\h*\\o\h+\\l\h*{(.*)}$/) {
-                push @toc, $1;
+            if (/^\h*\\contentspage\b/) {
+                $inhdr = 1;
            }
        }
    }
+    die "Missing \\title in $file\n" if ($inhdr);
+    die "Unclosed TOC in $file\n" if ($intoc);
    close FILE;
 }

@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/Show More
+++ b/Show More