aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorselsta <selsta@sent.at>2019-11-20 00:31:25 +0100
committerselsta <selsta@sent.at>2019-11-20 15:32:42 +0100
commit4a526810ced0e06317782fd84d1507ea08da363b (patch)
tree95e9edb333c068035194905ea91d70fa72e19cc2
parent2f5c47e95fab6beec40e8c1dec7b74c75b931a0c (diff)
downloadmonzero-gui-4a526810ced0e06317782fd84d1507ea08da363b.tar.gz
monzero-gui-4a526810ced0e06317782fd84d1507ea08da363b.tar.xz
monzero-gui-4a526810ced0e06317782fd84d1507ea08da363b.zip
workflows: check if QML loads successfully
-rw-r--r--.github/workflows/build.yml6
-rw-r--r--main.cpp7
2 files changed, 12 insertions, 1 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index db4fcee4..7869c361 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,6 +13,8 @@ jobs:
run: brew update && brew install boost hidapi zmq libpgm unbound libsodium miniupnpc ldns expat doxygen graphviz libunwind-headers protobuf qt5
- name: build
run: export PATH=$PATH:/usr/local/opt/qt/bin && ./build.sh
+ - name: test qml
+ run: build/release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml
build-ubuntu:
@@ -25,6 +27,8 @@ jobs:
- name: install monero dependencies
run: sudo apt -y install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev
- name: install monero gui dependencies
- run: sudo apt -y install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev
+ run: sudo apt -y install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev xvfb
- name: build
run: ./build.sh
+ - name: test qml
+ run: xvfb-run -a build/release/bin/monero-wallet-gui --test-qml
diff --git a/main.cpp b/main.cpp
index 063389fd..b3a97260 100644
--- a/main.cpp
+++ b/main.cpp
@@ -174,7 +174,10 @@ int main(int argc, char *argv[])
QCoreApplication::translate("main", "Log to specified file"),
QCoreApplication::translate("main", "file"));
+ QCommandLineOption testQmlOption("test-qml");
+ testQmlOption.setFlags(QCommandLineOption::HiddenFromHelp);
parser.addOption(logPathOption);
+ parser.addOption(testQmlOption);
parser.addHelpOption();
parser.process(app);
@@ -405,6 +408,10 @@ int main(int argc, char *argv[])
return 1;
}
+ // QML loaded successfully.
+ if (parser.isSet(testQmlOption))
+ return 0;
+
#ifdef WITH_SCANNER
QObject *qmlCamera = rootObject->findChild<QObject*>("qrCameraQML");
if (qmlCamera)