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

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.