Commit 3f636350 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/3.6'

Conflicts:
    src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
    src/plugins/git/gitplugin.cpp

Change-Id: I78a21510d484b655e01141a3543e08ee2123f9cd
parents 22e3a7b3 49958909
......@@ -64,7 +64,11 @@
To show the file encoding of the current file on the editor toolbar (4),
select \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
\uicontrol Display > \uicontrol {Display file encoding}.
\uicontrol Display > \uicontrol {Display file encoding}. To change the
encoding, click it on the toolbar and select new encoding in the
\uicontrol {Text Encoding} dialog. To reload the file with the selected
encoding, select \uicontrol {Reload with Encoding}. To save the file with
the new encoding, select \uicontrol {Save with Encoding}.
\note Other convenient ways of navigating in \QC are provided by the
\l{Searching with the Locator}{locator}, \l{Keyboard Shortcuts}
......
......@@ -26,7 +26,7 @@
\contentspage {Qt Creator Manual}
\previouspage creator-usability.html
\page creator-coding.html
\nextpage creator-modeling.html
\nextpage creator-editor-functions.html
\title Coding
......@@ -34,12 +34,6 @@
\list
\li \l{Modeling}
You can use the experimental model editor to create Universal
Modeling Language (UML) style models with structured diagrams and
store them in XML format.
\li \l{Writing Code}
Writing, editing, and navigating in source code are core tasks in
......@@ -85,18 +79,11 @@
to use for opening the file. If your files do not match the
predefined MIME types, you can edit the MIME types.
\li \l{Comparing Files}
You can use a diff editor to compare two versions of a file and
view the differences side-by-side in the \uicontrol Edit mode.
\li \l{Parsing C++ Files}
\li \l{Modeling}
An experimental Clang code model plugin enables you to replace the
built-in \QC code model with the Clang code model. Clang is a C
language family front end for LLVM. Clang provides you with more
accurate information than the built-in code model but can be slower
to use for large projects.
You can use the experimental model editor to create Universal
Modeling Language (UML) style models with structured diagrams and
store them in XML format.
\endlist
......
......@@ -24,7 +24,7 @@
/*!
\contentspage {Qt Creator Manual}
\previouspage creator-modeling.html
\previouspage creator-coding.html
\page creator-editor-functions.html
\nextpage creator-coding-navigating.html
......@@ -93,4 +93,23 @@
\endlist
\section1 Related Topics
\list
\li \l{Comparing Files}
You can use a diff editor to compare two versions of a file and
view the differences side-by-side in the \uicontrol Edit mode.
\li \l{Parsing C++ Files}
An experimental Clang code model plugin enables you to replace the
built-in \QC code model with the Clang code model. Clang is a C
language family front end for LLVM. Clang provides you with more
accurate information than the built-in code model but can be slower
to use for large projects.
\endlist
*/
......@@ -26,7 +26,7 @@
\contentspage {Qt Creator Manual}
\previouspage creator-editor-fakevim.html
\page creator-mime-types.html
\nextpage creator-building-running.html
\nextpage creator-modeling.html
\title Editing MIME Types
......
......@@ -24,9 +24,9 @@
/*!
\contentspage {Qt Creator Manual}
\previouspage creator-coding.html
\previouspage creator-mime-types.html
\page creator-modeling.html
\nextpage creator-editor-functions.html
\nextpage creator-building-running.html
\title Modeling
......
......@@ -29,7 +29,7 @@
For more information about the supported device groups and reference devices,
see \l{http://doc.qt.io/QtForDeviceCreation/qtee-supported-platforms.html}
{Supported Platforms} in the {http://doc.qt.io/QtForDeviceCreation/index.html}
{Supported Platforms} in the \l{http://doc.qt.io/QtForDeviceCreation/index.html}
{Qt for Device Creation} documentation.
\section2 Mobile Devices
......
......@@ -24,7 +24,7 @@
/*!
\contentspage {Qt Creator Manual}
\previouspage creator-mime-types.html
\previouspage creator-modeling.html
\page creator-building-running.html
\nextpage creator-building-targets.html
......
......@@ -72,11 +72,11 @@
\endlist
\li \b {\l{Coding}}
\list
\li \l{Modeling}
\li \l{Writing Code}
\li \l{Finding}
\li \l{Refactoring}
\li \l{Configuring the Editor}
\li \l{Modeling}
\endlist
\row
\li \inlineimage creator_buildingrunning.png
......@@ -113,7 +113,6 @@
\li \l{Known Issues}
\li \l{Glossary}
\endlist
\li
\row
\li {4,1} \note To report bugs and suggestions to the Qt Bug
Tracker, select \uicontrol {Help > Report Bug}.
......@@ -194,7 +193,6 @@
\endlist
\li \l{Coding}
\list
\li \l{Modeling}
\li \l{Writing Code}
\list
\li \l{Working in Edit Mode}
......@@ -221,6 +219,7 @@
\li \l{Using FakeVim Mode}
\endlist
\li \l{Editing MIME Types}
\li \l{Modeling}
\endlist
\li \l{Building and Running}
\list
......
......@@ -25,7 +25,7 @@
/*!
\contentspage {Qt Creator Manual}
\previouspage creator-using-qt-quick-designer.html
\previouspage qmldesigner-connections.html
\page quick-components.html
\nextpage quick-buttons.html
......
......@@ -31,7 +31,7 @@
\contentspage {Qt Creator Manual}
\previouspage qmldesigner-pathview-editor.html
\page qmldesigner-connections.html
\nextpage quick-export-to-qml.html
\nextpage quick-components.html
\title Adding Connections
......
......@@ -26,7 +26,7 @@
\contentspage {Qt Creator Manual}
\previouspage creator-quick-ui-forms.html
\page creator-using-qt-quick-designer.html
\nextpage quick-components.html
\nextpage qmldesigner-pathview-editor.html
\title Using Qt Quick Designer
......
......@@ -29,7 +29,7 @@
/*!
\contentspage {Qt Creator Manual}
\previouspage creator-qtquick-designer-extensions.html
\previouspage creator-using-qt-quick-designer.html
\page qmldesigner-pathview-editor.html
\nextpage qmldesigner-connections.html
......
......@@ -1034,9 +1034,8 @@ class DumperBase:
# We cannot use str(addr) as it yields rubbish for char pointers
# that might trigger Unicode encoding errors.
#return addr.cast(lookupType("void").pointer())
# We do not use "hex(...)" as it (sometimes?) adds a "L" suffix.
try:
return "0x%x" % toInteger(addr)
return "0x%x" % toInteger(hex(addr), 16)
except:
warn("CANNOT CONVERT TYPE: %s" % type(addr))
try:
......
......@@ -8,7 +8,7 @@
"trDisplayCategory": "Application",
"icon": "3dapplication.png",
"featuresRequired": [ "QtSupport.Wizards.FeatureQtCanvas3d" ],
"enabled": "${JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}",
"enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}",
"options":
[
......
......@@ -5,7 +5,7 @@
"category": "H.Project",
"trDescription": "Creates a Qt Quick 2 UI project with a QML entry point. To use it, you need to have a QML runtime environment such as qmlscene set up. Consider using a Qt Quick Application project instead.",
"trDisplayName": "Qt Quick UI",
"trDisplayCategory": "Application",
"trDisplayCategory": "Other Project",
"icon": "../../qmake/qtquickapplication/qml_wizard.png",
"enabled": "%{JS: [ %{Plugins} ].indexOf('QmlProjectManager') >= 0}",
"featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQt" ],
......
......@@ -5,7 +5,7 @@
"category": "H.Project",
"trDescription": "Creates a Qt Quick 2 UI project using Qt Quick Controls with a QML entry point. To use it, you need to have a QML runtime environment such as qmlscene set up. Consider using a Qt Quick Controls Application project instead.",
"trDisplayName": "Qt Quick Controls UI",
"trDisplayCategory": "Application",
"trDisplayCategory": "Other Project",
"icon": "../../qmake/qtquickapplication/qml_wizard.png",
"enabled": "%{JS: [ %{Plugins} ].indexOf('QmlProjectManager') >= 0}",
"featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQt" ],
......
......@@ -1390,10 +1390,6 @@ Deploying local Qt libraries is incompatible with Android 5.</source>
<source>Core plugin is disabled.</source>
<translation>Базовый модуль отключён.</translation>
</message>
<message>
<source>No valid theme &quot;%1&quot;</source>
<translation>Подходящая тема «%1» не обнаружена</translation>
</message>
</context>
<context>
<name>ApplicationWindowSpecifics</name>
......@@ -5382,6 +5378,10 @@ Continue?</source>
</context>
<context>
<name>Core::Internal::CorePlugin</name>
<message>
<source>No themes found in installation.</source>
<translation>Темы не установлены.</translation>
</message>
<message>
<source>The current date (ISO).</source>
<translation>Текущая дата (ISO).</translation>
......@@ -8285,26 +8285,6 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
<source>Form</source>
<translation></translation>
</message>
<message>
<source>Code Completion and Semantic Highlighting</source>
<translation>Дополнение и подсветка кода</translation>
</message>
<message>
<source>C</source>
<translation>C</translation>
</message>
<message>
<source>C++</source>
<translation>C++</translation>
</message>
<message>
<source>Objective C</source>
<translation>Objective C</translation>
</message>
<message>
<source>Objective C++</source>
<translation>Objective C++</translation>
</message>
<message>
<source>Pre-compiled Headers</source>
<translation>Прекомпилированные заголовки</translation>
......@@ -8318,8 +8298,20 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
<translation>Игнорировать прекомпилированные заголовки</translation>
</message>
<message>
<source>Headers</source>
<translation>Заголовочные</translation>
<source>&lt;i&gt;Activate the Clang Code Model plugin to enable the options here.&lt;/i&gt;</source>
<translation>&lt;i&gt;Включите модуль Clang Code Model, чтобы менять настройки.&lt;/i&gt;</translation>
</message>
<message>
<source>Use Clang Code Model</source>
<translation>Использовать модель кода Clang</translation>
</message>
<message>
<source>Append additional command line options to Clang, one per line. &lt;i&gt;Use this with care.&lt;/i&gt;</source>
<translation>Дополнительные параметры командной строки Clang, по одной на строке.&lt;br&gt;&lt;i&gt;Используйте их с осторожностью.&lt;/i&gt;</translation>
</message>
<message>
<source>Reset Options</source>
<translation>Сбросить</translation>
</message>
</context>
<context>
......@@ -10437,14 +10429,6 @@ Flags: %3</source>
<source>Changes the font size in the debugger views when the font size in the main editor changes.</source>
<translation>Менять размер шрифта в окне отладчика при изменении его в основном окне редактора.</translation>
</message>
<message>
<source>Populates the source file view automatically. This might slow down debugger startup considerably.</source>
<translation>Автоматическое заполнение просмотра файлов исходных текстов. Может замедлить процесс запуска отладчика.</translation>
</message>
<message>
<source>Populate source file view automatically</source>
<translation>Автоматически заполнять представление исходных текстов</translation>
</message>
<message>
<source>Switch to previous mode on debugger exit</source>
<translation>Переключаться в предыдущий режим при завершении отладчика</translation>
......@@ -11364,10 +11348,6 @@ Qt Creator не может подключиться к нему.</translation>
<source>Use Tooltips in Stack View when Debugging</source>
<translation>Подсказки в обзоре стека при отладке</translation>
</message>
<message>
<source>List Source Files</source>
<translation>Показать файлы исходников</translation>
</message>
<message>
<source>Skip Known Frames</source>
<translation>Пропустить известные кадры</translation>
......@@ -22142,6 +22122,10 @@ Ids must begin with a lowercase letter.</source>
</context>
<context>
<name>ProjectExplorer::Internal::DependenciesWidget</name>
<message>
<source>Synchronize configuration</source>
<translation>Синхронизировать конфигурацию</translation>
</message>
<message>
<source>Synchronize active kit, build, and deploy configuration between projects.</source>
<translation>Сихронизировать у проектов текущий комплект и конфигурации сборки и установки.</translation>
......@@ -34043,7 +34027,7 @@ with a password, which you can enter below.</source>
<context>
<name>TextEditor::FindInFiles</name>
<message>
<source>Files on File System</source>
<source>Files in File System</source>
<translation>Файлы в системе</translation>
</message>
<message>
......@@ -38740,6 +38724,10 @@ should a repository require SSH-authentication (see documentation on SSH and the
</context>
<context>
<name>WinRt::Internal::WinRtDebugSupport</name>
<message>
<source>Not enough free ports for QML debugging.</source>
<translation>Недостаточно свободных портов для отладки QML.</translation>
</message>
<message>
<source>The WinRT debugging helper is missing from your Qt Creator installation. It was assumed to be located at %1</source>
<translation>Помощник отладчика WinRT отсутствует в составе установки вашего Qt Creator. Предполагается, что он находится в %1</translation>
......@@ -3349,7 +3349,7 @@ public:
DeclarationAST *declaration;
public: // annotations
Scope *symbol;
Template *symbol;
public:
TemplateDeclarationAST()
......
......@@ -1917,19 +1917,9 @@ bool Bind::visit(SimpleDeclarationAST *ast)
methodKey = methodKeyForInvokableToken(tokenKind(ast->qt_invokable_token));
// unsigned qt_invokable_token = ast->qt_invokable_token;
const ExpressionAST *declTypeExpression = 0;
bool isTypedef = false;
FullySpecifiedType type;
for (SpecifierListAST *it = ast->decl_specifier_list; it; it = it->next) {
type = this->specifier(it->value, type);
if (type.isTypedef())
isTypedef = true;
type.setTypedef(isTypedef);
if (type.isDecltype()) {
if (DecltypeSpecifierAST *decltypeSpec = it->value->asDecltypeSpecifier())
declTypeExpression = decltypeSpec->expression;
}
}
List<Symbol *> **symbolTail = &ast->symbols;
......@@ -1985,8 +1975,6 @@ bool Bind::visit(SimpleDeclarationAST *ast)
translationUnit()->error(location(declaratorId->name, ast->firstToken()), "auto-initialized variable must have an initializer");
else if (initializer)
decl->setInitializer(asStringLiteral(initializer));
} else if (declTy.isDecltype()) {
decl->setInitializer(asStringLiteral(declTypeExpression));
}
if (_scope->isClass()) {
......@@ -2367,15 +2355,11 @@ bool Bind::visit(ParameterDeclarationAST *ast)
bool Bind::visit(TemplateDeclarationAST *ast)
{
Scope *scope = 0;
if (ast->less_token)
scope = control()->newTemplate(ast->firstToken(), 0);
else
scope = control()->newExplicitInstantiation(ast->firstToken(), 0);
scope->setStartOffset(tokenAt(ast->firstToken()).utf16charsBegin());
scope->setEndOffset(tokenAt(ast->lastToken() - 1).utf16charsEnd());
ast->symbol = scope;
Scope *previousScope = switchScope(scope);
Template *templ = control()->newTemplate(ast->firstToken(), 0);
templ->setStartOffset(tokenAt(ast->firstToken()).utf16charsBegin());
templ->setEndOffset(tokenAt(ast->lastToken() - 1).utf16charsEnd());
ast->symbol = templ;
Scope *previousScope = switchScope(templ);
for (DeclarationListAST *it = ast->template_parameter_list; it; it = it->next) {
this->declaration(it->value);
......@@ -2384,17 +2368,12 @@ bool Bind::visit(TemplateDeclarationAST *ast)
this->declaration(ast->declaration);
(void) switchScope(previousScope);
Symbol *decl = 0;
if (Template *templ = scope->asTemplate())
decl = templ->declaration();
else if (ExplicitInstantiation *inst = scope->asExplicitInstantiation())
decl = inst->declaration();
if (decl) {
scope->setSourceLocation(decl->sourceLocation(), translationUnit());
scope->setName(decl->name());
if (Symbol *decl = templ->declaration()) {
templ->setSourceLocation(decl->sourceLocation(), translationUnit());
templ->setName(decl->name());
}
_scope->addMember(scope);
_scope->addMember(templ);
return false;
}
......@@ -3039,7 +3018,6 @@ bool Bind::visit(TypeofSpecifierAST *ast)
bool Bind::visit(DecltypeSpecifierAST *ast)
{
_type = this->expression(ast->expression);
_type.setDecltype(true);
return false;
}
......
......@@ -112,7 +112,6 @@ class Function;
class Namespace;
class NamespaceAlias;
class Template;
class ExplicitInstantiation;
class BaseClass;
class Block;
class Class;
......
Markdown is supported
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