Skip to content

GitLab

Commit e4c0d293 authored by hjk's avatar hjk
Browse files

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

parents 5c723064 de329d31
Hide whitespace changes
Inline Side-by-side
doc/qtcreator.qdoc
View file @ e4c0d293
......@@ -5,7 +5,7 @@
\title Qt Creator Manual
\section1 Version 1.0.0
\section1 Version 1.0.80
The goal of Qt Creator is to provide a cross-platform, complete Integrated
Development Environment (IDE) to develop Qt projects. It is available for
......@@ -60,7 +60,7 @@
\o \l{Keyboard Shortcuts}
\o \l{Glossary}
\o \l{Supported Platforms}
\o \l{Known Issues of Version 1.0.0}
\o \l{Known Issues of Version 1.0.80}
\o \l{Acknowledgements}
\endlist
......@@ -1449,9 +1449,9 @@
\page creator-known-issues.html
\nextpage creator-acknowledgements.html
\title Known Issues of Version 1.0.0
\title Known Issues of Version 1.0.80
There are some known issues with Qt Creator 1.0.0 .
There are some known issues with Qt Creator 1.0.80.
The development team is aware of those, there is no need to report them as bug.
\list
......
doc/qtcreator.qdocconf
View file @ e4c0d293
......@@ -17,15 +17,15 @@ sources.fileextensions = "qtcreator.qdoc"
qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp
qhp.QtCreator.namespace = com.nokia.qtcreator.100
qhp.QtCreator.namespace = com.nokia.qtcreator.1080
qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator
qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = classic.css \
images/qt-logo.png
qhp.QtCreator.filterAttributes = qtcreator 1.0.0
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.0
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.0
qhp.QtCreator.filterAttributes = qtcreator 1.0.80
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.80
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.80
# macros.qdocconf
......@@ -198,8 +198,8 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
"<td align=\"right\" valign=\"top\" width=\"230\"></td></tr></table><br>"
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
"<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia</td>\n" \
"<td width=\"40%\" align=\"center\">&nbsp;</td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.0.0</div></td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.0.80</div></td>\n" \
"</tr></table></div></address>"
share/qtcreator/Info.plist
View file @ e4c0d293
......@@ -182,8 +182,8 @@
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator</string>
<key>CFBundleVersion</key>
<string>1.0.0</string>
<string>1.0.80</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<string>1.0.80</string>
</dict>
</plist>
src/libs/cplusplus/CppDocument.cpp
View file @ e4c0d293
......@@ -28,6 +28,7 @@
**************************************************************************/
#include "CppDocument.h"
#include "pp.h"
#include <Control.h>
#include <TranslationUnit.h>
......@@ -145,9 +146,18 @@ void Document::appendMacro(const Macro &macro)
_definedMacros.append(macro);
}
void Document::addMacroUse(const Macro &macro, unsigned offset, unsigned length)
void Document::addMacroUse(const Macro &macro, unsigned offset, unsigned length,
const QVector<MacroArgumentReference> &actuals)
{
_macroUses.append(MacroUse(macro, offset, offset + length));
MacroUse use(macro, offset, offset + length);
foreach (const MacroArgumentReference &actual, actuals) {
const Block arg(actual.position(), actual.position() + actual.length());
use.addArgument(arg);
}
_macroUses.append(use);
}
TranslationUnit *Document::translationUnit() const
......@@ -316,3 +326,18 @@ void Document::releaseTranslationUnit()
{
_translationUnit->release();
}
Snapshot::Snapshot()
{
}
Snapshot::~Snapshot()
{
}
void Snapshot::insert(Document::Ptr doc)
{
if (doc)
insert(doc->fileName(), doc);
}
src/libs/cplusplus/CppDocument.h
View file @ e4c0d293
......@@ -43,6 +43,7 @@
namespace CPlusPlus {
class Macro;
class MacroArgumentReference;
class CPLUSPLUS_EXPORT Document
{
......@@ -63,7 +64,8 @@ public:
void addIncludeFile(const QString &fileName, unsigned line);
void appendMacro(const Macro &macro);
void addMacroUse(const Macro &macro, unsigned offset, unsigned length);
void addMacroUse(const Macro &macro, unsigned offset, unsigned length,
const QVector<MacroArgumentReference> &range);
Control *control() const;
TranslationUnit *translationUnit() const;
......@@ -201,6 +203,7 @@ public:
class MacroUse: public Block {
Macro _macro;
QVector<Block> _arguments;
public:
inline MacroUse(const Macro &macro,
......@@ -212,6 +215,18 @@ public:
const Macro &macro() const
{ return _macro; }
bool isFunctionLike() const
{ return _macro.isFunctionLike(); }
QVector<Block> arguments() const
{ return _arguments; }
void setArguments(const QVector<Block> &arguments)
{ _arguments = arguments; }
void addArgument(const Block &block)
{ _arguments.append(block); }
};
QList<Include> includes() const
......@@ -241,12 +256,15 @@ private:
class CPLUSPLUS_EXPORT Snapshot: public QMap<QString, Document::Ptr>
{
typedef QMap<QString, Document::Ptr> _Base;
public:
Snapshot()
{ }
Snapshot();
~Snapshot();
void insert(Document::Ptr doc);
~Snapshot()
{ }
using _Base::insert;
};
} // end of namespace CPlusPlus
......
src/libs/cplusplus/PreprocessorClient.h
View file @ e4c0d293
......@@ -31,7 +31,7 @@
#define CPLUSPLUS_PP_CLIENT_H
#include <CPlusPlusForwardDeclarations.h>
#include <QtGlobal>
#include <QVector>
QT_BEGIN_NAMESPACE
class QByteArray;
......@@ -42,6 +42,23 @@ namespace CPlusPlus {
class Macro;
class CPLUSPLUS_EXPORT MacroArgumentReference
{
unsigned _position;
unsigned _length;
public:
MacroArgumentReference(unsigned position = 0, unsigned length = 0)
: _position(position), _length(length)
{ }
unsigned position() const
{ return _position; }
unsigned length() const
{ return _length; }
};
class CPLUSPLUS_EXPORT Client
{
Client(const Client &other);
......@@ -63,7 +80,9 @@ public:
virtual void startExpandingMacro(unsigned offset,
const Macro &macro,
const QByteArray &originalTextt) = 0;
const QByteArray &originalText,
const QVector<MacroArgumentReference> &actuals
= QVector<MacroArgumentReference>()) = 0;
virtual void stopExpandingMacro(unsigned offset,
const Macro &macro) = 0;
......
src/libs/cplusplus/pp-engine.cpp
View file @ e4c0d293
......@@ -741,10 +741,11 @@ void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &sour
// `m' is function-like macro.
if (_dot->is(T_LPAREN)) {
skipActualArguments();
QVector<MacroArgumentReference> actuals;
collectActualArguments(&actuals);
if (_dot->is(T_RPAREN)) {
expandFunctionLikeMacro(identifierToken, m);
expandFunctionLikeMacro(identifierToken, m, actuals);
continue;
}
}
......@@ -764,23 +765,58 @@ void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &sour
_result = previousResult;
}
void Preprocessor::skipActualArguments()
void Preprocessor::collectActualArguments(QVector<MacroArgumentReference> *actuals)
{
int count = 0;
if (_dot->isNot(T_LPAREN))
return;
while (_dot->isNot(T_EOF_SYMBOL)) {
if (_dot->is(T_LPAREN))
++count;
++_dot;
else if (_dot->is(T_RPAREN)) {
if (! --count)
break;
}
if (_dot->is(T_RPAREN))
return;
actuals->append(collectOneActualArgument());
while (_dot->is(T_COMMA)) {
++_dot;
actuals->append(collectOneActualArgument());
}
}
MacroArgumentReference Preprocessor::collectOneActualArgument()
{
const unsigned position = _dot->begin();
while (_dot->isNot(T_EOF_SYMBOL)) {
if (_dot->is(T_COMMA) || _dot->is(T_RPAREN))
break;
if (_dot->isNot(T_LPAREN))
++_dot;
else {
int count = 0;
for (; _dot->isNot(T_EOF_SYMBOL); ++_dot) {
if (_dot->is(T_LPAREN))
++count;
else if (_dot->is(T_RPAREN)) {
if (! --count) {
++_dot;
break;
}
}
}
}
}
const unsigned end = _dot->begin();
return MacroArgumentReference(position, end - position);
}
Macro *Preprocessor::processObjectLikeMacro(TokenIterator identifierToken,
const QByteArray &spell,
Macro *m)
......@@ -846,7 +882,9 @@ void Preprocessor::expandObjectLikeMacro(TokenIterator identifierToken,
client->stopExpandingMacro(_dot->offset, *m);
}
void Preprocessor::expandFunctionLikeMacro(TokenIterator identifierToken, Macro *m)
void Preprocessor::expandFunctionLikeMacro(TokenIterator identifierToken,
Macro *m,
const QVector<MacroArgumentReference> &actuals)
{
const char *beginOfText = startOfToken(*identifierToken);
const char *endOfText = endOfToken(*_dot);
......@@ -858,7 +896,7 @@ void Preprocessor::expandFunctionLikeMacro(TokenIterator identifierToken, Macro
endOfText - beginOfText);
client->startExpandingMacro(identifierToken->offset,
*m, text);
*m, text, actuals);
}
expand(beginOfText, endOfText, _result);
......
src/libs/cplusplus/pp-engine.h
View file @ e4c0d293
......@@ -109,7 +109,8 @@ private:
void expandObjectLikeMacro(TokenIterator identifierToken,
const QByteArray &spell,
Macro *m, QByteArray *result);
void expandFunctionLikeMacro(TokenIterator identifierToken, Macro *m);
void expandFunctionLikeMacro(TokenIterator identifierToken, Macro *m,
const QVector<MacroArgumentReference> &actuals);
void resetIfLevel();
bool testIfLevel();
......@@ -129,7 +130,8 @@ private:
QByteArray tokenSpell(const CPlusPlus::Token &token) const;
QByteArray tokenText(const CPlusPlus::Token &token) const; // does a deep copy
void skipActualArguments();
void collectActualArguments(QVector<MacroArgumentReference> *actuals);
MacroArgumentReference collectOneActualArgument();
void processNewline();
......
src/plugins/bineditor/BinEditor.pluginspec
View file @ e4c0d293
<plugin name="BinEditor" version="1.0.0" compatVersion="1.0.0">
<plugin name="BinEditor" version="1.0.80" compatVersion="1.0.80">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Binary editor component.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.0"/>
<dependency name="TextEditor" version="1.0.0"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
</dependencyList>
</plugin>
src/plugins/bookmarks/Bookmarks.pluginspec
View file @ e4c0d293
<plugin name="Bookmarks" version="1.0.0" compatVersion="1.0.0">
<plugin name="Bookmarks" version="1.0.80" compatVersion="1.0.80">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Bookmarks in text editors.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="Core" version="1.0.0"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
</dependencyList>
</plugin>
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
View file @ e4c0d293
<plugin name="CMakeProjectManager" version="1.0.0" compatVersion="1.0.0">
<plugin name="CMakeProjectManager" version="1.0.80" compatVersion="1.0.80">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>CMake support</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="CppTools" version="1.0.0"/>
<dependency name="CppEditor" version="1.0.0"/>
<dependency name="Help" version="1.0.0"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="CppTools" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.80"/>
<dependency name="Help" version="1.0.80"/>
</dependencyList>
</plugin>
src/plugins/coreplugin/Core.pluginspec
View file @ e4c0d293
<plugin name="Core" version="1.0.0" compatVersion="1.0.0">
<plugin name="Core" version="1.0.80" compatVersion="1.0.80">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......
src/plugins/coreplugin/coreconstants.h
View file @ e4c0d293
......@@ -35,7 +35,7 @@ namespace Constants {
#define IDE_VERSION_MAJOR 1
#define IDE_VERSION_MINOR 0
#define IDE_VERSION_RELEASE 0
#define IDE_VERSION_RELEASE 80
#define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
......
src/plugins/coreplugin/editormanager/openeditorsview.cpp
View file @ e4c0d293
......@@ -70,8 +70,8 @@ OpenEditorsWidget::OpenEditorsWidget()
m_ui.editorList->setModel(em->openedEditorsModel());
connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(updateCurrentItem(Core::IEditor*)));
connect(m_ui.editorList, SIGNAL(itemClicked(QTreeWidgetItem*, int)),
this, SLOT(selectEditor(QTreeWidgetItem*)));
connect(m_ui.editorList, SIGNAL(clicked(QModelIndex)),
this, SLOT(selectEditor(QModelIndex)));
//updateEditorList();
}
......
src/plugins/cpaster/CodePaster.pluginspec
View file @ e4c0d293
<plugin name="CodePaster" version="1.0.0" compatVersion="1.0.0">
<plugin name="CodePaster" version="1.0.80" compatVersion="1.0.80">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Codepaster plugin for pushing/fetching diff from server</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="Core" version="1.0.0"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
</dependencyList>
</plugin>
src/plugins/cppeditor/CppEditor.pluginspec
View file @ e4c0d293
<plugin name="CppEditor" version="1.0.0" compatVersion="1.0.0">
<plugin name="CppEditor" version="1.0.80" compatVersion="1.0.80">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>C/C++ editor component.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.0"/>
<dependency name="TextEditor" version="1.0.0"/>
<dependency name="CppTools" version="1.0.0"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="CppTools" version="1.0.80"/>
</dependencyList>
</plugin>
src/plugins/cpptools/CppTools.pluginspec
View file @ e4c0d293
<plugin name="CppTools" version="1.0.0" compatVersion="1.0.0">
<plugin name="CppTools" version="1.0.80" compatVersion="1.0.80">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Tools for analyzing C/C++ code.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="QuickOpen" version="1.0.0"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="QuickOpen" version="1.0.80"/>
</dependencyList>
</plugin>
src/plugins/cpptools/cppmodelmanager.cpp
View file @ e4c0d293
......@@ -191,7 +191,8 @@ protected:
virtual void macroAdded(const Macro &macro);
virtual void startExpandingMacro(unsigned offset,
const Macro &macro,
const QByteArray &originalText);
const QByteArray &originalText,
const QVector<MacroArgumentReference> &actuals);
virtual void stopExpandingMacro(unsigned offset, const Macro &macro);
virtual void startSkippingBlocks(unsigned offset);
virtual void stopSkippingBlocks(unsigned offset);
......@@ -404,13 +405,14 @@ void CppPreprocessor::macroAdded(const Macro &macro)
void CppPreprocessor::startExpandingMacro(unsigned offset,
const Macro &macro,
const QByteArray &originalText)
const QByteArray &originalText,
const QVector<MacroArgumentReference> &actuals)
{
if (! m_currentDoc)
return;
//qDebug() << "start expanding:" << macro.name << "text:" << originalText;
m_currentDoc->addMacroUse(macro, offset, originalText.length());
m_currentDoc->addMacroUse(macro, offset, originalText.length(), actuals);
}
void CppPreprocessor::stopExpandingMacro(unsigned, const Macro &)
......@@ -544,7 +546,7 @@ CppModelManager::CppModelManager(QObject *parent)
m_core = Core::ICore::instance(); // FIXME
m_dirty = true;
ProjectExplorer::ProjectExplorerPlugin *pe =
ProjectExplorer::ProjectExplorerPlugin *pe =
ProjectExplorer::ProjectExplorerPlugin::instance();
QTC_ASSERT(pe, return);
......
src/plugins/debugger/Debugger.pluginspec
View file @ e4c0d293
<plugin name="Debugger" version="1.0.0" compatVersion="1.0.0">
<plugin name="Debugger" version="1.0.80" compatVersion="1.0.80">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Debugger integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="CppEditor" version="1.0.0"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="Core" version="1.0.0"/>
<dependency name="Find" version="1.0.0"/>
<dependency name="CppEditor" version="1.0.80"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="Find" version="1.0.80"/>
</dependencyList>
</plugin>
src/plugins/designer/Designer.pluginspec
View file @ e4c0d293
<plugin name="Designer" version="1.0.0" compatVersion="1.0.0">
<plugin name="Designer" version="1.0.80" compatVersion="1.0.80">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Qt Designer integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.0"/>
<dependency name="Core" version="1.0.80"/>
<!-- For compiling with CPP support enabled -->
<dependency name="CppEditor" version="1.0.0"/>
<dependency name="CppEditor" version="1.0.80"/>
</dependencyList>
</plugin>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment