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

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";