diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-06 14:21:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-07 13:07:25 +0100 |
| commit | a1fe728fa5bd6cb9e50cf317a58efcf4eea4de2c (patch) | |
| tree | 0798ae897d111147238544826c79243b6f9a48a4 /INSTALL | |
| parent | 57fe9bd2c6a361cf979d17d962abed5db17a1457 (diff) | |
| parent | 65bd80ebfc1be81a196a861ade40ff874a3554f0 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
src/plugins/platforms/android/androidjnimain.cpp
src/plugins/platforms/android/qandroidplatformintegration.cpp
src/plugins/platforms/android/qandroidplatformintegration.h
src/plugins/platforms/android/qandroidplatformopenglcontext.cpp
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/sql/doc/src/sql-driver.qdoc
src/widgets/widgets/qtoolbararealayout.cpp
Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
Diffstat (limited to 'INSTALL')
| -rw-r--r-- | INSTALL | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,10 +1,10 @@ INSTALLING Qt Source Package Version %VERSION%. -For full installation instructions for each supported platform, please -see http://qt-project.org/doc/qt-%SHORTVERSION%/qtdoc/installation.html, +For instructions on building and installing Qt for each supported platform, +please see http://qt-project.org/doc/qt-%SHORTVERSION%/build-sources.html, or follow one of these links: -Mac OS X: http://qt-project.org/doc/qt-%SHORTVERSION%/qtdoc/install-mac.html -Windows: http://qt-project.org/doc/qt-%SHORTVERSION%/qtdoc/install-win.html -Windows CE: http://qt-project.org/doc/qt-%SHORTVERSION%/qtdoc/install-wince.html -X11 Platforms: http://qt-project.org/doc/qt-%SHORTVERSION%/qtdoc/install-x11.html +Mac OS X: http://qt-project.org/doc/qt-%SHORTVERSION%/macosx-building.html +Windows: http://qt-project.org/doc/qt-%SHORTVERSION%/windows-building.html +X11 Platforms: http://qt-project.org/doc/qt-%SHORTVERSION%/linux-building.html +Windows CE: http://qt-project.org/doc/qt-%SHORTVERSION%/install-wince.html |