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

doc/doc.pri

 unix {
     QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/tools/qdoc3/qdoc3
-    HELPGENERATOR = qhelpgenerator
+    HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
 } else {
     QDOC = $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
-    HELPGENERATOR = qhelpgenerator
+    HELPGENERATOR = $$(QTDIR)\bin\qhelpgenerator.exe
 }
 
 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp

src/plugins/cpptools/cppcodecompletion.cpp

@@ -723,7 +723,7 @@ bool CppCodeCompletion::completeScope(const QList<TypeOfExpression::Result> &res
         return false; // nothing to do.
 
     // Search for a class or a namespace.
-    TypeOfExpression::Result result(FullySpecifiedType(), 0);
+    TypeOfExpression::Result result;
     foreach (result, results) {
         FullySpecifiedType ty = result.first;
 
@@ -751,8 +751,7 @@ bool CppCodeCompletion::completeScope(const QList<TypeOfExpression::Result> &res
     } else if (Symbol *symbol = result.second) {
         if (symbol->isTypedef()) {
             ResolveClass resolveClass;
-            const QList<Symbol *> candidates = resolveClass(result,
-                                                                   context);
+            const QList<Symbol *> candidates = resolveClass(result, context);
             completeClass(candidates, context);
         }
     }

src/plugins/qt4projectmanager/profileeditor.cpp

@@ -132,8 +132,8 @@ void ProFileEditor::setFontSettings(const TextEditor::FontSettings &fs)
 
     static QVector<QString> categories;
     if (categories.isEmpty()) {
-        categories << QLatin1String(TextEditor::Constants::C_VARIABLE)
-                   << QLatin1String(TextEditor::Constants::C_FUNCTION)
+        categories << QLatin1String(TextEditor::Constants::C_TYPE)
+                   << QLatin1String(TextEditor::Constants::C_KEYWORD)
                    << QLatin1String(TextEditor::Constants::C_COMMENT);
     }
 

src/plugins/qt4projectmanager/profileeditorfactory.cpp

@@ -36,7 +36,6 @@
 #include "qt4projectmanager.h"
 #include "qt4projectmanagerconstants.h"
 #include "profileeditor.h"
-#include "qt4projectmanagerenums.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/fileiconprovider.h>

src/plugins/qt4projectmanager/profilehighlighter.h

@@ -34,8 +34,6 @@
 #ifndef PROFILEHIGHLIGHTER_H
 #define PROFILEHIGHLIGHTER_H
 
-#include "qt4projectmanagerenums.h"
-
 #include <QtCore/QtAlgorithms>
 #include <QtGui/QSyntaxHighlighter>
 #include <QtGui/QTextCharFormat>
@@ -47,6 +45,13 @@ class ProFileHighlighter : public QSyntaxHighlighter
 {
     Q_OBJECT
 public:
+    enum ProfileFormats {
+        ProfileVariableFormat,
+        ProfileFunctionFormat,
+        ProfileCommentFormat,
+        NumProfileFormats
+    };
+
     ProFileHighlighter(QTextDocument *document = 0);
     virtual void highlightBlock(const QString &text);
 
@@ -58,7 +63,6 @@ public:
 
 private:
     QTextCharFormat m_formats[NumProfileFormats];
-
 };
 
 } // namespace Internal

src/plugins/qt4projectmanager/qt4projectmanager.pro

@@ -5,7 +5,6 @@ include(../../qworkbenchplugin.pri)
 include(qt4projectmanager_dependencies.pri)
 HEADERS = qt4projectmanagerplugin.h \
     qt4projectmanager.h \
-    qt4projectmanagerenums.h \
     qtversionmanager.h \
     qt4project.h \
     qt4nodes.h \
@@ -45,7 +44,6 @@ HEADERS = qt4projectmanagerplugin.h \
     projectloadwizard.h \
     directorywatcher.h \
     gdbmacrosbuildstep.h
-
 SOURCES = qt4projectmanagerplugin.cpp \
     qt4projectmanager.cpp \
     qtversionmanager.cpp \
@@ -84,7 +82,6 @@ SOURCES = qt4projectmanagerplugin.cpp \
     projectloadwizard.cpp \
     directorywatcher.cpp \
     gdbmacrosbuildstep.cpp
-
 FORMS = qtversionmanager.ui \
     envvariablespage.ui \
     enveditdialog.ui \

src/plugins/qt4projectmanager/qt4projectmanagerenums.h

-/***************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact:  Qt Software Information (qt-info@nokia.com)
-**
-**
-** Non-Open Source Usage
-**
-** Licensees may use this file in accordance with the Qt Beta Version
-** License Agreement, Agreement version 2.2 provided with the Software or,
-** alternatively, in accordance with the terms contained in a written
-** agreement between you and Nokia.
-**
-** GNU General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the packaging
-** of this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-**
-** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
-**
-***************************************************************************/
-
-#ifndef QT4PRO_ENUMS_H
-#define QT4PRO_ENUMS_H
-
-namespace Qt4ProjectManager {
-namespace Internal {
-
-enum ProfileFormats {
-    ProfileVariableFormat,
-    ProfileFunctionFormat,
-    ProfileCommentFormat,
-    NumProfileFormats
-};
-
-} // namespace Internal
-} // namespace Qt4ProjectManager
-
-#endif // QT4PRO_ENUMS_H

src/plugins/texteditor/texteditorconstants.h

@@ -91,9 +91,6 @@ const char * const C_REMOVED_LINE        = "RemovedLine";
 const char * const C_DIFF_FILE           = "DiffFile";
 const char * const C_DIFF_LOCATION       = "DiffLocation";
 
-const char * const C_VARIABLE            = "Variable";
-const char * const C_FUNCTION            = "Function";
-
 } // namespace Constants
 } // namespace TextEditor
 

src/plugins/texteditor/texteditorsettings.cpp

@@ -91,10 +91,6 @@ TextEditorSettings::TextEditorSettings(Internal::TextEditorPlugin *plugin,
     formatDescriptions.push_back(FormatDescription(QLatin1String(C_DIFF_FILE), tr("Diff File"), Qt::black));
     formatDescriptions.push_back(FormatDescription(QLatin1String(C_DIFF_LOCATION), tr("Diff Location"), Qt::green));
 
-    // Pro file categories
-    formatDescriptions.push_back(FormatDescription(QLatin1String(C_VARIABLE), tr("Variable"), Qt::blue));
-    formatDescriptions.push_back(FormatDescription(QLatin1String(C_FUNCTION), tr("Function"), Qt::green));
-
     m_fontSettingsPage = new FontSettingsPage(formatDescriptions,
                                               QLatin1String("TextEditor"),
                                               tr("Text Editor"),