Update README for qt6 and cmake

Author: pinheadmz

README.md

@@ -1,16 +1,18 @@
-# Bitcoin Core QML GUI
+# Bitcoin Core App
+
+*(The QML GUI)*
 
 **WARNING: THIS IS EXPERIMENTAL, DO NOT USE BUILDS FROM THIS REPO FOR REAL TRANSACTIONS!**
 
-This directory contains the source code for an experimental Bitcoin Core graphical user interface (GUI) built using the [Qt Quick](https://doc.qt.io/qt-5/qtquick-index.html) framework.
+This directory contains the source code for an experimental Bitcoin Core graphical user interface (GUI) built using the [Qt Quick](https://doc.qt.io/qt-6/qtquick-index.html) framework.
 
-Unsecure CI artifacts are available for local testing of the master branch, avoiding the need to build. These can be found under the [Actions](https://github.com/bitcoin-core/gui-qml/actions?query=branch%3Amain) tab. It is required to have and be logged into a github account in order to download these.
+Unsecure CI artifacts are available for local testing of the master branch, avoiding the need to build. These can be found under the [Actions](https://github.com/bitcoin-core/gui-qml/actions?query=branch%3Aqt6) tab. It is required to have and be logged into a github account in order to download these.
 
 Note: For macOS, the CI artifact binary must be made executable and code-signed before it can
 be ran. To make executable and apply a signature, run the following on the unzipped CI artifact:
 
 ```
-chmod +x ./Downloads/bitcoin-qt && codesign -s - ./Downloads/bitcoin-qt
+chmod +x ./Downloads/bitcoin-core-app && codesign -s - ./Downloads/bitcoin-core-app
 ```
 
 ## Goals and Limitations
@@ -25,24 +27,22 @@ The primary goals of the project can be summed up as follows:
 - Work alongside the Bitcoin Design community to develop an aesthetic GUI
 - Develop a mobile-optimized GUI
 
-We must avoid conflicts with the Bitcoin Core repo.
-As such, this project will aim to make very few changes outside of the qml directory.
-Pull requests must be focused on developing the GUI itself, adding build support,
-or improving relevant documentation.
+Avoid conflicts with the Bitcoin Core repository by importing it unmodified as a [git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules).
+As such, this project **can not** accept pull requests making any significant changes unrelated to the GUI.
+Pull requests must be focused on developing the GUI itself, adding build support, or improving relevant documentation.
 
-This project will **not** accept pull requests making any significant changes unrelated to the GUI.
 
 ## Development Process
 
-This repo is synced with the [Bitcoin Core repo](https://github.com/bitcoin/bitcoin) on a weekly basis, or as needed to resolve conflicts.
+This repo is synced with the [Bitcoin Core repo](https://github.com/bitcoin/bitcoin) on a regular basis.
 
-Contributions are welcome from all, developers and designers. If you are a new contributor, please read [CONTRIBUTING.md](../../CONTRIBUTING.md).
+Contributions are welcome from all, developers and designers. If you are a new contributor, please read [CONTRIBUTING.md](https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md).
 
 ### Minimum Required Qt Version
 
-All development must adhere to the current upstream Qt Version to minimize our divergence from upstream and avoid costly changes. Review of open PR's must ensure that changes are compatible with this Qt version. Currently, the required version is [Qt 5.15.2](https://github.com/bitcoin-core/gui-qml/blob/main/depends/packages/qt.mk#L2).
+All development must adhere to the current upstream Qt Version to minimize our divergence from upstream and avoid costly changes. Review of open PR's must ensure that changes are compatible with this Qt version. Currently, the required version is [Qt 6.2](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md#build-1).
 
-As the Qt Version changes upstream, refactoring is allowed to use the now available features.
+As the Qt Version changes upstream, refactoring is allowed to use the newly available features.
 
 ### Policies
 
@@ -52,50 +52,60 @@ This project has custom policies for development, see:
 
 ## Compile and Run
 
-The master branch is only guaranteed to work and build on Debian-based systems, Fedora, and macOS.
+The master branch is only guaranteed to work and build on Debian-based systems and macOS.
 Support for more systems will be confirmed and documented as the project matures.
 
 ### Dependencies
-No additional dependencies, besides those in [build-osx.md](../../doc/build-osx.md), are needed for macOS.
 
-Aside from the dependencies listed in [build-unix.md](../../doc/build-unix.md), the following additional dependencies are required to compile:
+Bitcoin Core App requires all the same dependencies as Bitcoin Core, see the
+appropriate document for your platform:
+
+- [build-osx.md](https://github.com/bitcoin/bitcoin/blob/master/doc/build-osx.md)
+
+- [build-unix.md](https://github.com/bitcoin/bitcoin/blob/master/doc/build-unix.md)
+
+In addition the following dependencies are required for the GUI:
 
 #### Debian-based systems:
 
 ```
-sudo apt install qtdeclarative5-dev qtquickcontrols2-5-dev
+sudo apt install qt6-base-dev qt6-tools-dev qt6-l10n-tools qt6-tools-dev-tools libgl-dev libqrencode-dev
 ```
 
-The following runtime dependencies are also required for dynamic builds;
-they are not needed for static builds:
+Additionally, to support Wayland protocol for modern desktop environments:
 
 ```
-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 qml-module-qt-labs-settings
+sudo apt install qt6-wayland
 ```
-##### Important:
 
-If you're unable to install the dependencies through your system's package manager, you can instead perform a [depends build](../../depends/README.md).
-
-#### Fedora:
+#### macOS:
 
 ```
-sudo dnf install qt5-qtdeclarative-devel qt5-qtquickcontrols qt5-qtquickcontrols2-devel
+brew install qt@6 qrencode
 ```
 
 ### Build
 
-For instructions on how to build and compile Bitcoin Core, refer to your respective system's build doc.
-
-As long as the required dependencies are installed, the qml GUI will be built.
-To ensure that you are in fact building the qml GUI, you can configure with the following option:
-
+1. Install the required dependencies for your platform and clone the repository
+2. Fetch the Bitcoin Core submodule:
 ```
-./configure --with-qml
+git submodule update --init --recursive --depth 1
+```
+3. Configure
+```
+cmake -B build
+```
+4. Build
+```
+cmake --build build -j$(nproc)
 ```
 
 ### Run
 
-To run the qml GUI:
+Binaries are exported to the `build/` directory:
 ```
-./src/qt/bitcoin-qt
+build/bin/bitcoin-core-app
 ```
+
+
+

qml/doc/icon-policy.md renamed to doc/icon-policy.md

@@ -10,7 +10,7 @@ follow-up PR.
 
 Translator comments only apply to strings that are marked for translation.
 For more information, see:
-[Internationalization and Localization with Qt Quick](https://doc.qt.io/qt-5/qtquick-internationalization.html)
+[Internationalization and Localization with Qt Quick](https://doc.qt.io/qt-6/i18n-source-translation.html)
 
 Below, the values for the `text` and `description` properties are examples of
 new user-facing strings marked for translation without translator comments: