From 2c74d01e94e66f4c04ee27b9c6384dc51e4c97ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 8 Jan 2009 13:44:37 +0100 Subject: [PATCH 1/4] Fixed 'make docs' lauching of qhelpgenerator It assumed qhelpgenerator was in the path, though this isn't necessarily the case. Use the absolute directory instead. --- doc/doc.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/doc.pri b/doc/doc.pri index cb800823ec4..d8e65d4a944 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,9 +1,9 @@ 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 From 171a3bb8d2977380a1d8b668fecab11bba608ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 8 Jan 2009 15:09:21 +0100 Subject: [PATCH 2/4] Fixed compilation problem with gcc 3.3 Reviewed-by: Roberto Raggi --- src/plugins/cpptools/cppcodecompletion.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index b1184420bf6..2cd859ecb9e 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -723,7 +723,7 @@ bool CppCodeCompletion::completeScope(const QList &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 &res } else if (Symbol *symbol = result.second) { if (symbol->isTypedef()) { ResolveClass resolveClass; - const QList candidates = resolveClass(result, - context); + const QList candidates = resolveClass(result, context); completeClass(candidates, context); } } From 57ab0b9e8e2006f85bd6841bd7a4fac5932397cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 8 Jan 2009 16:15:25 +0100 Subject: [PATCH 3/4] Changed categories used for pro file highlighting Now reuses the colors set for Type and Keyword for the variables and functions respectively. Having the categories Variable and Function in the fonts and color settings was confusing. --- .../qt4projectmanager/profileeditor.cpp | 4 +- .../profileeditorfactory.cpp | 1 - .../qt4projectmanager/profilehighlighter.h | 8 ++- .../qt4projectmanager/qt4projectmanager.pro | 3 -- .../qt4projectmanagerenums.h | 50 ------------------- src/plugins/texteditor/texteditorconstants.h | 3 -- src/plugins/texteditor/texteditorsettings.cpp | 4 -- 7 files changed, 9 insertions(+), 64 deletions(-) delete mode 100644 src/plugins/qt4projectmanager/qt4projectmanagerenums.h diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp index ddcb0b4252b..6d4f36f1f79 100644 --- a/src/plugins/qt4projectmanager/profileeditor.cpp +++ b/src/plugins/qt4projectmanager/profileeditor.cpp @@ -132,8 +132,8 @@ void ProFileEditor::setFontSettings(const TextEditor::FontSettings &fs) static QVector 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); } diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp index a18fda7b5d9..bc9e1729eb4 100644 --- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp +++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp @@ -36,7 +36,6 @@ #include "qt4projectmanager.h" #include "qt4projectmanagerconstants.h" #include "profileeditor.h" -#include "qt4projectmanagerenums.h" #include #include diff --git a/src/plugins/qt4projectmanager/profilehighlighter.h b/src/plugins/qt4projectmanager/profilehighlighter.h index 7dd2ccd5a9c..5d603cae160 100644 --- a/src/plugins/qt4projectmanager/profilehighlighter.h +++ b/src/plugins/qt4projectmanager/profilehighlighter.h @@ -47,6 +47,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 +65,6 @@ public: private: QTextCharFormat m_formats[NumProfileFormats]; - }; } // namespace Internal diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro index fa291eadd24..c7dc608437f 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.pro +++ b/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 \ diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerenums.h b/src/plugins/qt4projectmanager/qt4projectmanagerenums.h deleted file mode 100644 index 247dae0117f..00000000000 --- a/src/plugins/qt4projectmanager/qt4projectmanagerenums.h +++ /dev/null @@ -1,50 +0,0 @@ -/*************************************************************************** -** -** 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 diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h index 46d5bf363e9..f87e1df6b83 100644 --- a/src/plugins/texteditor/texteditorconstants.h +++ b/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 diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 2f9c597be65..5794935182c 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/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"), From 2c0a52098ee5195e1adc8e563db4858c0de24d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 8 Jan 2009 17:10:39 +0100 Subject: [PATCH 4/4] Whoops, forgot to remove an include --- src/plugins/qt4projectmanager/profilehighlighter.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/profilehighlighter.h b/src/plugins/qt4projectmanager/profilehighlighter.h index 5d603cae160..bdbf9c60457 100644 --- a/src/plugins/qt4projectmanager/profilehighlighter.h +++ b/src/plugins/qt4projectmanager/profilehighlighter.h @@ -34,8 +34,6 @@ #ifndef PROFILEHIGHLIGHTER_H #define PROFILEHIGHLIGHTER_H -#include "qt4projectmanagerenums.h" - #include #include #include