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:
	src/plugins/debugger/debuggeroptionspage.cpp

Change-Id: I0282d66b16c14877d0131cccbe03573102b48bc3
This commit is contained in:
Eike Ziller
2015-03-05 13:28:15 +01:00
parent 39f904957a 9b68aade38
commit 86378da3be
15 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@@ -43,7 +43,7 @@ versions of Qt and Qt Creator on Windows. Alternatively, to avoid having to
compile Qt yourself, you can use one of the versions of Qt shipped with the Qt
SDK (release builds of Qt using MinGW and Visual C++ 2010 or later).
For detailed information on the supported compilers, see
http://qt-project.org/wiki/Building_Qt_5_from_Git .
http://wiki.qt.io/Building_Qt_5_from_Git .
1. Decide which compiler to use: MinGW or Microsoft Visual Studio. If you
plan to contribute to Qt Creator, you should compile your changes with
@@ -75,7 +75,7 @@ http://qt-project.org/wiki/Building_Qt_5_from_Git .
directory.
7. Install a compiler:
- For a MinGW toolchain for Qt, see http://qt-project.org/wiki/MinGW .
- For a MinGW toolchain for Qt, see http://wiki.qt.io/MinGW .
- For Microsoft Visual C++, install the Windows SDK and the "Debugging
Tools for Windows" from the SDK image. We strongly recommend using the
@@ -122,7 +122,7 @@ http://qt-project.org/wiki/Building_Qt_5_from_Git .
You have to remove it from the path.
10. You are now ready to configure and build Qt and Qt Creator.
Please see http://qt-project.org/wiki/Building_Qt_5_from_Git for
Please see http://wiki.qt.io/Building_Qt_5_from_Git for
recommended configure-options for Qt 5.
To use MinGW, open the the shell prompt and enter:

2
dist/appdata.xml vendored
View File

@@ -23,6 +23,6 @@
<screenshots>
<screenshot type="default" width="800" height="600">http://qt-project.org/uploads/image_upload/qtcreator-edit-mode.png</screenshot>
</screenshots>
<url type="homepage">https://qt-project.org/wiki/Category:Tools::QtCreator</url>
<url type="homepage">https://wiki.qt.io/Category:Tools::QtCreator</url>
<project_group>Qt</project_group>
</application>

15
dist/changes-3.3.2 vendored Normal file
View File

@@ -0,0 +1,15 @@
Qt Creator version 3.3.2 contains bug fixes.
The most important changes are listed in this document. For a complete
list of changes, see the Git log for the Qt Creator sources that
you can check out from the public Git repository. For example:
git clone git://gitorious.org/qt-creator/qt-creator.git
git log --cherry-pick --pretty=oneline v3.3.1..v3.3.2
C++ Support
* Fixed deployment of Clang code model plugin (QTCREATORBUG-14038)
Qt Quick Designer
* Fixed crash of Qt Quick emulation layer when using fallback emulation
(QTCREATORBUG-14031)

6
doc/api/coding-style.qdoc
View File

@@ -59,7 +59,7 @@
the philosophy behind Qt development. For more information about how to set up
the development environment for working on Qt Creator and how to submit code
and documentation for inclusion, see
\l{http://wiki.qt-project.org/index.php/Main_Page}{Guidelines for Contributions to the Qt Project}.
\l{https://wiki.qt.io/Qt_Contribution_Guidelines}{Qt Contribution Guidelines}.
\section1 Binary and Source Compatibility
@@ -109,7 +109,7 @@
\li Do not reimplement functions (not even inlines,
nor protected or private functions).
\li Check
\l {http://wiki.qt-project.org/index.php/Binary_Compatibility_Workarounds}{Binary Compatibility Workarounds}
\l {https://wiki.qt.io/Binary_Compatibility_Workarounds}{Binary Compatibility Workarounds}
for ways to preserve binary compatibility.
\endlist
@@ -640,7 +640,7 @@
\target coding-rules-namespacing
\section2 Namespacing
Read \l {http://wiki.qt-project.org/index.php/Qt_In_Namespace}{Qt In Namespace}
Read \l{https://wiki.qt.io/Qt_In_Namespace}{Qt In Namespace}
and keep in mind that all of Qt Creator is \e{namespace aware} code.
The namespacing policy within Qt Creator is as follows:

5
doc/api/getting-and-building.qdoc
View File

@@ -37,8 +37,7 @@
(You can find the current version in our source repository here:
\l{http://qt.gitorious.org/qt-creator/qt-creator/blobs/master/qtcreator.pro}.)
You can get prebuilt Qt packages from the
\l{https://download.qt-project.org/official_releases/qt/}{Qt Project download page}.
You can get prebuilt Qt packages from \l{https://download.qt.io}{Qt Downloads}.
If you want to use Qt as provided by your Linux distribution, you need to make sure that all
Qt development packages and private header packages are also installed.
@@ -48,7 +47,7 @@
released source bundles, or from the Gitorious repository
\l{http://qt.gitorious.org/qt-creator}. If you intend to contribute to \QC
itself, you should use the repository from our Gerrit review tool as described
in the developer wiki here: \l{http://wiki.qt-project.org/Setting_up_Gerrit}.
in: \l{https://wiki.qt.io/Setting_up_Gerrit}{Setting up Gerrit}.
We strongly encourage you to do out-of-source builds of \QC (also called
shadow-builds).

2
doc/api/qtcreator-documentation.qdoc
View File

@@ -131,7 +131,7 @@
\section1 Writing Text
Follow the guidelines for
\l{http://qt-project.org/wiki/Writing_Qt_Documentation}
\l{http://wiki.qt.io/Writing_Qt_Documentation}
{writing Qt documentation}.
The documentation must be grammatically correct English and use the standard

2
doc/src/debugger/creator-debugger-setup.qdoc
View File

@@ -181,7 +181,7 @@
versions of MinGW. On most Linux distributions the GDB
builds shipped with the system are sufficient. You can
also build your own. Follow the instructions in
\l{http://qt-project.org/wiki/QtCreatorBuildGdb}
\l{http://wiki.qt.io/QtCreator_Build_Gdb}
{Building GDB}.
Builds of GDB shipped with Xcode on OS X are no longer
supported.

4
doc/src/howto/qtcreator-faq.qdoc
View File

@@ -191,7 +191,7 @@
installed when you install \QC and \QSDK. On OS X, GDB is no longer
officially supported. To build your own Python-enabled GDB, follow the
instructions in
\l{http://qt-project.org/wiki/QtCreatorBuildGdb}{Building GDB}.
\l{https://wiki.qt.io/QtCreator_Build_Gdb}{Building GDB}.
You must use Python version 2.6 or 2.7.
@@ -220,7 +220,7 @@
On Windows, nmake does not support the \c{-j} parameter. Instead, we
provide a drop-in replacement called jom. You can download a precompiled
version of jom from \l{http://releases.qt-project.org/jom/}{Qt Project Release server}.
version of jom from \l{https://download.qt.io/official_releases/jom/}{Qt Downloads}.
Put jom.exe in a location in the %PATH%. Go to the \uicontrol {Build Settings}
and set jom.exe as the make command.

16
doc/src/overview/creator-tech-support.qdoc
View File

@@ -40,24 +40,28 @@
\li Where to Go
\row
\li Learn more about Qt
\li \l{http://qt-project.org/wiki/developer-guides}
{Qt Developer Guides}
\li View examples of what you can do with Qt
\li \l{https://doc.qt.io/qt-5/all-examples.html}{List of Qt Examples}
\l{https://doc.qt.io/qt-5/qtquick-codesamples.html}
{List of Qt Quick Examples}
\row
\li Develop Qt applications for desktop and mobile devices
\li \l{http://qt-project.org}{Qt Developer Network}
\li \l{https://www.qt.io/developers/}{Qt Developers}
\row
\li Participate in Qt development
\li \l{http://qt-project.org/contribute}{Contribute to Qt}
\li \l{https://wiki.qt.io/Qt_Contribution_Guidelines}
{Qt Contribution Guidelines}
\row
\li Find free Qt-based applications
\li \l{http://qt-apps.org/}{Qt Apps}
\row
\li Develop with a commercial Qt license and support - Qt by The Qt Company
\li Develop with a commercial Qt license and support -
Qt by The Qt Company
\li \l{http://qt.io/licensing/}{Qt Licensing}
\endtable

15
doc/src/projects/creator-projects-debuggers.qdoc
View File

@@ -58,20 +58,7 @@
\li For GDB, specify the path to the GDB executable. The
executable must be built with Python scripting support
enabled. The options you
have depend on the development and target platform:
\list
\li For debugging on embedded devices using a different ABI,
you must provide a special executable.
\li For debugging on Windows using MinGW, select a Windows
executable of GDB with Python scripting enabled. You can
download it from
\l{http://builds.qt-project.org/job/gdb-windows}.
\endlist
enabled.
\li For LLDB (experimental), specify the path to the LLDB
executable.

4
doc/src/qnx/creator-deployment-bb10.qdoc
View File

@@ -84,7 +84,7 @@
filter, so you need to set this filter in the top-right corner of the
\uicontrol {New} dialog to enable those templates.
\note Currently, the BlackBerry 10 devices and Simulator have Qt 4.8 libraries preinstalled. To use Qt 5 features, you must compile the Qt libraries for BlackBerry 10 yourself. For more information, see \l {http://qt-project.org/wiki/Building-Qt5-for-Blackberry}{http://qt-p roject.org/wiki/Building-Qt5-for-Blackberry}.
\note Currently, the BlackBerry 10 devices and Simulator have Qt 4.8 libraries preinstalled. To use Qt 5 features, you must compile the Qt libraries for BlackBerry 10 yourself. For more information, see \l {http://wiki.qt.io/Building_Qt5_for_Blackberry}{Building Qt5 for BlackBerry}.
For more details please refer to the Qt-Project wiki page: \l {http://qt-project.org/wiki/BlackBerry} {http://qt-project.org/wiki/BlackBerry}.
For more details please refer to the Qt-Project wiki page: \l {http://wiki.qt.io/BlackBerry}{Qt for BlackBerry}.
*/

2
doc/src/qnx/creator-developing-bb10.qdoc
View File

@@ -120,5 +120,5 @@
\include qnx/creator-key-management-qnx.qdocinc
For more details please refer to the Qt-Project wiki page: \l {http://qt-project.org/wiki/BlackBerry} {http://qt-project.org/wiki/BlackBerry}.
For more details please refer to the Qt-Project wiki page: \l {http://wiki.qt.io/BlackBerry}{Qt for BlackBerry}.
*/

2
src/plugins/debugger/debuggeroptionspage.cpp
View File

@@ -55,7 +55,7 @@ using namespace Utils;
namespace Debugger {
namespace Internal {
const char debuggingToolsWikiLinkC[] = "http://qt-project.org/wiki/Qt_Creator_Windows_Debugging";
const char debuggingToolsWikiLinkC[] = "http://wiki.qt.io/Qt_Creator_Windows_Debugging";
// --------------------------------------------------------------------------
// DebuggerTreeItem

2
src/plugins/qnx/blackberryruncontrolfactory.cpp
View File

@@ -188,7 +188,7 @@ RunControl *BlackBerryRunControlFactory::create(RunConfiguration *runConfigurati
if (qtVer && qtVer->qtVersion() <= QtSupport::QtVersionNumber(4, 8, 6))
Core::MessageManager::write(tr("Target Qt version (%1) might not support QML profiling. "
"Cascades applications are not affected and should work as expected. "
"For more info see http://qt-project.org/wiki/Qt-Creator-with-BlackBerry-10")
"For more info see http://wiki.qt.io/Qt_Creator_with_BlackBerry_10")
.arg(qtVer->qtVersionString()), Core::MessageManager::Flash
);

2
src/plugins/qnx/qnxconstants.h
View File

@@ -128,7 +128,7 @@ const char QNX_BLACKBERRY_DEFAULT_DEPLOY_QT_BASEPATH[] = "/accounts/devuser/";
const char QNX_OK_ICON[] = ":/qnx/images/ok.png";
const char QNX_BLACKBERRY_SETUP_URL[] = "http://qt-project.org/wiki/Qt-Creator-with-BlackBerry-10";
const char QNX_BLACKBERRY_SETUP_URL[] = "http://wiki.qt.io/Qt_Creator_with_BlackBerry_10";
const char QNX_LEGACY_KEYS_URL[] = "https://developer.blackberry.com/native/documentation/core"
"/com.qnx.doc.ide.userguide/topic/signing_and_publishing.html";
const char QNX_REGISTER_KEYS_URL[] = "https://www.blackberry.com/SignedKeys/codesigning.html";