diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 16 | ||||
| -rw-r--r-- | doc/src/cmake/cmake-manual.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 10 |
4 files changed, 23 insertions, 7 deletions
diff --git a/.qmake.conf b/.qmake.conf index 37ebce428..898cedcf6 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 diff --git a/dependencies.yaml b/dependencies.yaml new file mode 100644 index 000000000..ee6c08adb --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,16 @@ +dependencies: + ../qtdeclarative: + ref: 7b2e90258c2e4719d41c5306c3d55a604ef1520b + required: true + ../qtmultimedia: + ref: 4b8bd1fd790b4a78e336e2c5c25eaa84fadbc2f4 + required: false + ../qtquickcontrols: + ref: 30bebfb6f0332046b6a229c1995b92261d89d776 + required: false + ../qtquickcontrols2: + ref: e499f73f8f6dc97712b26a596c9c6ea5e5c8bcea + required: false + ../qttools: + ref: e4177a8db1144f52d71df7ebab2e6755ae21fb01 + required: true diff --git a/doc/src/cmake/cmake-manual.qdoc b/doc/src/cmake/cmake-manual.qdoc index ebd18593a..440dda8ab 100644 --- a/doc/src/cmake/cmake-manual.qdoc +++ b/doc/src/cmake/cmake-manual.qdoc @@ -37,7 +37,7 @@ project files. \c{CMake} is a 3rd party tool with its own \l{CMake Documentation}{documentation}. This topic - describes how to use \c{CMake} 3.1.0 with Qt 5. + describes how to use \c{CMake} 3.1.0 or later with Qt 5. \section1 Table of Contents diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 76bf4be7e..2bc2bc148 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -443,8 +443,9 @@ ANGLE depends on these extra tools from the \l{GnuWin32 Project}{GnuWin32} and \l {http://sourceforge.net/projects/winflexbison/}{Win flex-bison} - projects, which are provided for your convenience in the \e gnuwin32/bin - folder: + projects. You can download a copy containing flex and bison from: + \l {https://download.qt.io/development_releases/gnuwin32/gnuwin32.zip} + or from the respective upstream projects: \list \li \l{http://gnuwin32.sourceforge.net/downlinks/gperf.php}{GPerf} \li \l{http://sourceforge.net/projects/winflexbison/files/win_flex_bison-2.5.5.zip/download}{Bison, Flex} @@ -452,9 +453,8 @@ The \e gnuwin32/bin folder should be added to the \c PATH variable. - \note If you are building qtbase outside of qt5.git, you will need to - download \e win_bison and \e win_flex from the link above and rename - them to \e bison and \e flex. + \note If you download from the winflexbison project, you must + download \e win_bison and \e win_flex and rename them to \e bison and \e flex. For instructions for building the Qt 5 source, read the \l{Qt for Windows - Building from Source} page. |