diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
| commit | ce9519593a0b3deb99d1dd2529770f7e9fffef92 (patch) | |
| tree | c9bca05230dd68f49494240ae930bad1fe0c5956 /dist/README | |
| parent | 509f77cca28aa3edea5523c5869bae4412ed2ccc (diff) | |
| parent | 7baaec17edb06634f1d6235a55c7adbd112cba3e (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
mkspecs/android-g++/qmake.conf
qmake/generators/unix/unixmake2.cpp
src/gui/image/qimage_conversions.cpp
Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
Diffstat (limited to 'dist/README')
| -rw-r--r-- | dist/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/README b/dist/README index f0d2034001..f6e6775d6a 100644 --- a/dist/README +++ b/dist/README @@ -13,7 +13,7 @@ http://qt-project.org Be sure to check out the release notes, which will list any known problems or limitations of this version: -https://wiki.qt.io/?title=Category:Release +https://wiki.qt.io/Category:Release Overview @@ -101,7 +101,7 @@ Building Qt 5 from Source ------------------------- See <install_dir>/<version>/src/README and -http://wiki.qt.io/?title=Building_Qt_5_from_Git +http://wiki.qt.io/Building_Qt_5_from_Git for instructions on building Qt from source. |