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

Adapt jom download URL.

Browse Source 
Task-number: QTCREATORBUG-7979
Change-Id: I8e0bda75aca620d44651c83e0354846c39594c04
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Eike Ziller
2012-10-10 14:58:56 +02:00
parent f6815cd3b1
commit 942ad98348
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -107,7 +107,7 @@ SDK (release builds of Qt using MinGW and Visual C++ 2008).
For the Visual C++ compilers, it is recommended to use the tool 'jom'. For the Visual C++ compilers, it is recommended to use the tool 'jom'.
It is a replacement for nmake that utilizes all CPU cores and thus It is a replacement for nmake that utilizes all CPU cores and thus
speeds up compilation significantly. Download it from speeds up compilation significantly. Download it from
ftp://ftp.qt.nokia.com/jom/ and add the executable to the path. http://releases.qt-project.org/jom/ and add the executable to the path.
8. For convenience, we recommend creating shell prompts with the correct 8. For convenience, we recommend creating shell prompts with the correct
environment. This can be done by creating a .bat-file environment. This can be done by creating a .bat-file

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 On Windows, nmake does not support the \c{-j} parameter. Instead, we
provide a drop-in replacement called jom. You can download a precompiled 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} Put jom.exe in a location in the %PATH%. Go to the \gui {Build Settings}
and set jom.exe as the make command. and set jom.exe as the make command.

2
src/plugins/projectexplorer/projectexplorersettingspage.ui
View File

@@ -174,7 +174,7 @@
<item> <item>
<widget class="QLabel" name="jomLabel"> <widget class="QLabel" name="jomLabel">
<property name="text"> <property name="text">
<string>&lt;i&gt;jom&lt;/i&gt; is a drop-in replacement for &lt;i&gt;nmake&lt;/i&gt; which distributes the compilation process to multiple CPU cores. The latest binary is available at &lt;a href=&quot;ftp://ftp.qt.nokia.com/jom/&quot;&gt;ftp://ftp.qt.nokia.com/jom/&lt;/a&gt;. Disable it if you experience problems with your builds.</string> <string>&lt;i&gt;jom&lt;/i&gt; is a drop-in replacement for &lt;i&gt;nmake&lt;/i&gt; which distributes the compilation process to multiple CPU cores. The latest binary is available at &lt;a href=&quot;http://releases.qt-project.org/jom/&quot;&gt;http://releases.qt-project.org/jom/&lt;/a&gt;. Disable it if you experience problems with your builds.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>