feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.3' into 3.4

Browse Source 
Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb
This commit is contained in:
Eike Ziller
2015-02-25 10:15:28 +01:00
parent c6a4c80728 1104a6602b
commit 767f0ef58b
15 changed files with 79 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/api/coding-style.qdoc
+1 -1
View File
@@ -891,7 +891,7 @@
for signals and slots inside connect statements to safely make
signal and slot lookup a few cycles faster. You can use
$QTDIR/util/normalize to normalize existing code. For more
information, see \l{http://qt-project.org/doc/qt-4.8/qmetaobject.html#normalizedSignature}{QMetaObject::normalizedSignature}.
information, see QMetaObject::normalizedSignature.
\endlist
\section2 File Headers
doc/api/first-plugin.qdoc
+1 -1
View File
@@ -227,7 +227,7 @@
for use in \QC, by using the information you gave above.
For more information about qmake, and writing .pro files in general,
see the \l{http://qt-project.org/doc/qt-4.8/qmake-manual.html}{qmake Manual}.
see the \l{qmake Manual}.
\section1 Plugin Meta Data Template
doc/api/qtcreator-dev-wizards.qdoc
+1 -1
View File
@@ -23,7 +23,7 @@
\section1 Introduction
If the functionality provided by template-based
\l{http://doc.qt.digia.com/qtcreator-snapshot/creator-project-wizards.html}{custom wizards}
\l{http://doc.qt.io/qtcreator/creator-project-wizards.html}{custom wizards}
is not sufficient for your case, you can write wizards in code.
A wizard in Qt Creator is an instance of a class implementing
doc/api/qtcreator-dev.qdoc
+7 -7
View File
@@ -53,7 +53,7 @@
to which you can add your own snippets.
\list
\li \l{http://doc.qt.digia.com/qtcreator/creator-completing-code.html#editing-code-snippets}
\li \l{http://doc.qt.io/qtcreator/creator-completing-code.html#editing-code-snippets}
{Snippets User Interface}
\li \l{Snippets} {Adding Snippets Groups}
\endlist
@@ -64,7 +64,7 @@
own
file and project templates by writing XML definition files for them.
\list
\li \l{http://doc.qt.digia.com/qtcreator/creator-project-wizards.html}
\li \l{http://doc.qt.io/qtcreator/creator-project-wizards.html}
{Adding New Custom Wizards}
\li \l{User Interface Text Guidelines}
\endlist
@@ -96,7 +96,7 @@
the MIME type definitions in Qt Creator to your specific setup,
by adding or removing file extensions and specifying magic headers.
\list
\li \l{http://doc.qt.digia.com/qtcreator/creator-mime-types.html}
\li \l{http://doc.qt.io/qtcreator/creator-mime-types.html}
{Editing MIME Types}
\li \l{http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html}
{MIME Type Specification Files}
@@ -110,7 +110,7 @@
provided by the Kate Editor. You can download highlight definition files
for use with Qt Creator and create your own definition files.
\list
\li \l{http://doc.qt.digia.com/qtcreator/creator-editor-options.html#generic-highlighting}
\li \l{http://doc.qt.io/qtcreator/creator-editor-options.html#generic-highlighting}
{Generic Highlighting}
\li \l{http://kate-editor.org/2005/03/24/writing-a-syntax-highlighting-file/}
{Writing a Syntax Highlighting File}
@@ -162,7 +162,7 @@
to fill a feature suggestion.
The tool descriptions are saved as XML files that you can share.
\list
\li \l{http://doc.qt.digia.com/qtcreator/creator-editor-external.html}
\li \l{http://doc.qt.io/qtcreator/creator-editor-external.html}
{Using External Tools}
\li \l{External Tool Specification Files}
\endlist
@@ -189,7 +189,7 @@
If you need a way to configure the tool in Qt Creator, you can add an
\uicontrol Options page for it.
\list
\li \l{http://doc.qt.digia.com/qtcreator/creator-editor-external.html}
\li \l{http://doc.qt.io/qtcreator/creator-editor-external.html}
{Using External Tools}
\li \l{External Tool Specification Files}
\li \l{Creating Plugins}
@@ -214,7 +214,7 @@
the \uicontrol {Issues} output
pane.
\list
\li \l{http://doc.qt.digia.com/qtcreator/creator-task-lists.html}
\li \l{http://doc.qt.io/qtcreator/creator-task-lists.html}
{Showing Task List Files in the Issues Pane}
\li \l{Creating Plugins}
\li \l{Qt Creator Coding Rules}
doc/api/qtcreator-documentation.qdoc
+2 -2
View File
@@ -61,7 +61,7 @@
\section1 Configuring the Documentation Project
\QC documentation is written by using QDoc. For more information about using
QDoc, see the \l{http://qt-project.org/doc/qt-5.1/qdoc/qdoc-index.html}
QDoc, see the \l{http://doc.qt.io/qt-5/qdoc-index.html}
{QDoc Manual}.
QDoc finds the new topics automatically, when you place them as .qdoc files
@@ -299,7 +299,7 @@
on OS X. You can view the HTML files in a browser and the help files in
the \QC \uicontrol Help mode. For more information about adding the help files to
\QC, see
\l{http://qt-project.org/doc/qtcreator/creator-help.html#adding-external-documentation}
\l{http://doc.qt.io/qtcreator/creator-help.html#adding-external-documentation}
{Adding External Documentation}.
Besides \c docs, you have the following options: