Merge branch 'stable'

Conflicts:
	index.html
This commit is contained in:
Mark Brand 2013-02-27 01:31:15 +01:00
commit cd12d9cdeb
1 changed files with 2 additions and 2 deletions

View File

@ -369,7 +369,7 @@ If a cross compiler is detected then cross compile mode will be used.</pre>
<p>
If you have a
<a href="http://qt.nokia.com/">Qt</a> application,
<a href="http://qt-project.org/">Qt</a> application,
all you have to do is:
</p>
<pre>i686-pc-mingw32-qmake
@ -378,7 +378,7 @@ make</pre>
If you are using Qt plugins
such as the svg or ico image handlers,
you should also have a look at the
<a href="http://qt.nokia.com/doc/plugins-howto.html#static-plugins">Qt documentation about static plugins</a>.
<a href="https://qt-project.org/doc/qt-4.8/plugins-howto.html#static-plugins">Qt documentation about static plugins</a>.
</p>
<p>
Note the sql drivers (-qt-sql-*)