Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

bin/gdbmacros/gdbmacros.cpp

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

doc/api/qtcreator-api.qdoc

@@ -4,6 +4,10 @@
 
     Qt Creator is Qt Software's crossplatform IDE. The core of Qt Creator is
     basically only a \l{ExtensionSystem}{plugin loader}.
+    All functionality is implemented in plugins, the basis of Qt Creator is
+    implemented in the \l{Core} {Core} Plugin. The plugin manager provides
+    simple means for plugin cooperation that allow plugins to provide
+    hooks for other plugin's extensions.
 
     \section1 Core Libraries
 
@@ -75,8 +79,3 @@
     \generatelist functionindex
 */
 
-/*!
-    \group qtc
-
-    \title Core Plugin
-*/

doc/api/qtcreator-api.qdocconf

@@ -6,14 +6,14 @@ language                = Cpp
 headerdirs              = . \
                           ../../src/libs/aggregation \
                           ../../src/libs/extensionsystem \
-                          ../../src/plugins/core \
-                          ../../src/plugins/core/actionmanager
+                          ../../src/plugins/coreplugin \
+                          ../../src/plugins/coreplugin/actionmanager
 
 sourcedirs              = . \
                           ../../src/libs/aggregation \
                           ../../src/libs/extensionsystem \
-                          ../../src/plugins/core \
-                          ../../src/plugins/core/actionmanager
+                          ../../src/plugins/coreplugin \
+                          ../../src/plugins/coreplugin/actionmanager
 
 headers.fileextesnions  = "*.h"
 sources.fileextensions  = "*.cpp *.qdoc"

doc/doc.pri

@@ -2,7 +2,7 @@ unix {
     QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/tools/qdoc3/qdoc3
     HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
 } else {
-    QDOC = $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
+    QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
     HELPGENERATOR = $$(QTDIR)\bin\qhelpgenerator.exe
 }
 

doc/example/textfinder/main.cpp

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

doc/example/textfinder/textfinder.cpp

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

doc/example/textfinder/textfinder.h

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

doc/qtcreator.qdoc

@@ -151,6 +151,26 @@
 
     \image qtcreator-compile-pane.png
 
+
+    \section1 Session Management in Qt Creator
+
+    ### screenshot
+
+    In Qt Creator, a session is a collection of loaded projects, opened files,
+    editor settings, and so on. When you run Qt Creator, you have a default
+    session. You can create a new session using the \gui{Session Manager...},
+    available in the \gui{File -> Session} menu.
+
+    To switch between sessions, select \gui{File -> Session}. If you do not
+    create and select any session, Qt Creator will always use the default
+    session.
+
+\omit
+    session management can also store project dependencies, thorbjorn is
+    currently working on it
+\endomit
+
+
     \section1 Qt Help Integration
 
     Qt Creator comes fully integrated with all of Qt's documentation and

examples/scripting/demo.js

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/cgi.cpp

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/cgi.h

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/fetcher.cpp

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/fetcher.h

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/poster.cpp

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/poster.h

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/splitter.cpp

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/splitter.h

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/view.cpp

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cpaster/view.h

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **

shared/cplusplus/AST.cpp

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 **
 ** Contact:  Qt Software Information (qt-info@nokia.com)
 **
@@ -117,6 +117,9 @@ CatchClauseAST *AST::asCatchClause()
 ClassSpecifierAST *AST::asClassSpecifier()
 { return dynamic_cast<ClassSpecifierAST *>(this); }
 
+CompoundLiteralAST *AST::asCompoundLiteral()
+{ return dynamic_cast<CompoundLiteralAST *>(this); }
+
 CompoundStatementAST *AST::asCompoundStatement()
 { return dynamic_cast<CompoundStatementAST *>(this); }
 
@@ -774,6 +777,42 @@ unsigned BoolLiteralAST::lastToken() const
     return token + 1;
 }
 
+CompoundLiteralAST *CompoundLiteralAST::clone(MemoryPool *pool) const
+{
+    CompoundLiteralAST *ast = new (pool) CompoundLiteralAST;
+    ast->lparen_token = lparen_token;
+    if (type_id)
+        ast->type_id = type_id->clone(pool);
+    ast->rparen_token = rparen_token;
+    if (initializer)
+        ast->initializer = initializer->clone(pool);
+    return ast;
+}
+
+void CompoundLiteralAST::accept0(ASTVisitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(type_id, visitor);
+        accept(initializer, visitor);
+    }
+}
+
+unsigned CompoundLiteralAST::firstToken() const
+{
+    return lparen_token;
+}
+
+unsigned CompoundLiteralAST::lastToken() const
+{
+    if (initializer)
+        return initializer->lastToken();
+    else if (rparen_token)
+        return rparen_token + 1;
+    else if (type_id)
+        return type_id->lastToken();
+    return lparen_token + 1;
+}
+
 BreakStatementAST *BreakStatementAST::clone(MemoryPool *pool) const
 {
     BreakStatementAST *ast = new (pool) BreakStatementAST;