Merge #45: qml, build, doc: Allow import QtQuick.Layouts

5ce77ad qml, build, doc: Allow import QtQuick.Layouts (Hennadii Stepanov)

Pull request description:

  See #39:
  > ... we could at least add quick layouts.

ACKs for top commit:
  promag:
    Tested ACK 5ce77ad.

Tree-SHA512: f69da8c82ed0f597f6d3cd24bdbced5ff4352b73917ea259bd1b0241d9dbaeb296a48cebd16087d9e9c90dbda759a0d9ea35ff371fbde28ca50155e0068e685a

Author: hebasto

build-aux/m4/bitcoin_qt.m4

@@ -149,6 +149,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
       if test -d "$qt_plugin_path/../qml/QtQuick/Dialogs"; then
         QT_LIBS="$QT_LIBS -L$qt_plugin_path/../qml/QtQuick/Dialogs"
       fi
+      if test -d "$qt_plugin_path/../qml/QtQuick/Layouts"; then
+        QT_LIBS="$QT_LIBS -L$qt_plugin_path/../qml/QtQuick/Layouts"
+      fi
       if test -d "$qt_plugin_path/../qml/QtQuick/Templates.2"; then
         QT_LIBS="$QT_LIBS -L$qt_plugin_path/../qml/QtQuick/Templates.2"
       fi
@@ -195,6 +198,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
       _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuick2WindowPlugin], [-lwindowplugin])
       _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls1Plugin], [-lqtquickcontrolsplugin])
       _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls2Plugin], [-lqtquickcontrols2plugin])
+      _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickLayoutsPlugin], [-lqquicklayoutsplugin])
       _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickTemplates2Plugin], [-lqtquicktemplates2plugin])
     fi
   fi

src/qml/README.md

@@ -51,7 +51,7 @@ The following runtime dependencies are also required for dynamic builds;
 they are not needed for static builds:
 
 ```
-sudo apt install qml-module-qtquick2 qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-window2
+sudo apt install qml-module-qtquick2 qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-layouts qml-module-qtquick-window2
 ```
 
 No additional dependencies, besides those in [build-osx.md](../../doc/build-osx.md), are needed for macOS.

src/qml/bitcoin.cpp

@@ -41,6 +41,7 @@ Q_IMPORT_PLUGIN(QtQuick2Plugin);
 Q_IMPORT_PLUGIN(QtQuick2WindowPlugin);
 Q_IMPORT_PLUGIN(QtQuickControls1Plugin);
 Q_IMPORT_PLUGIN(QtQuickControls2Plugin);
+Q_IMPORT_PLUGIN(QtQuickLayoutsPlugin);
 Q_IMPORT_PLUGIN(QtQuickTemplates2Plugin);
 #endif
 

src/qml/pages/stub.qml

@@ -4,6 +4,7 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.11
 import "../components" as BitcoinCoreComponents