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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
This commit is contained in:
Eike Ziller
2012-10-11 21:11:40 +02:00
parent c7f1aeac11 236bd842b5
commit 720cb9f35e
75 changed files with 860 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,7 +167,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{ftp://ftp.qt.nokia.com/jom/}{Qt FTP server}.
version of jom from \l{http://releases.qt-project.org/jom/}{Qt Project Release server}.
Put jom.exe in a location in the %PATH%. Go to the \gui {Build Settings}
and set jom.exe as the make command.