From d332121d7c25b22eeb3df7696f53c232e3776be2 Mon Sep 17 00:00:00 2001 From: dsc Date: Wed, 4 May 2022 05:35:19 +0200 Subject: [PATCH] Include QtQuick (QML) inside the Linux buildbot and get rid of the alpha warning --- CMakeLists.txt | 2 +- Dockerfile | 15 ++++++++------- src/mainwindow.cpp | 7 ------- src/utils/config.cpp | 1 - src/utils/config.h | 1 - 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41a2402..07cee3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -216,7 +216,7 @@ if(TOR_BIN) set(TOR_BIN "${tor_path}") endforeach() else() - if(not EXISTS "${TOR_BIN}") + if(NOT EXISTS "${TOR_BIN}") message(FATAL_ERROR "TOR_BIN is set, but file does not exist: '${TOR_BIN}'") endif() diff --git a/Dockerfile b/Dockerfile index 2677321..a2c101b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -288,12 +288,17 @@ RUN rm /usr/lib/x86_64-linux-gnu/libX11.a && \ git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \ cd qt5 && \ git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \ + git clone git://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \ + git clone git://code.qt.io/qt/qtgraphicaleffects.git -b ${QT_VERSION} --depth 1 && \ git clone git://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \ git clone git://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \ + git clone git://code.qt.io/qt/qtquickcontrols.git -b ${QT_VERSION} --depth 1 && \ + git clone git://code.qt.io/qt/qtquickcontrols2.git -b ${QT_VERSION} --depth 1 && \ git clone git://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \ git clone git://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \ git clone git://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \ git clone git://code.qt.io/qt/qtx11extras.git -b ${QT_VERSION} --depth 1 && \ + git clone git://code.qt.io/qt/qtxmlpatterns.git -b ${QT_VERSION} --depth 1 && \ git clone git://code.qt.io/qt/qtwebsockets.git -b ${QT_VERSION} --depth 1 && \ sed -ri s/\(Libs:.*\)/\\1\ -lexpat/ /usr/local/lib/pkgconfig/fontconfig.pc && \ sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \ @@ -301,18 +306,14 @@ RUN rm /usr/lib/x86_64-linux-gnu/libX11.a && \ sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf && \ OPENSSL_LIBS="-lssl -lcrypto -lpthread -ldl" \ ./configure --prefix=/usr -platform linux-g++-64 -opensource -confirm-license -release -static -no-avx \ - -no-opengl -qpa xcb --xcb -xcb-xlib -feature-xlib -openssl-linked -I /usr/local/openssl/include \ - -L /usr/local/openssl/lib -system-freetype -fontconfig -glib \ - -no-dbus -no-sql-sqlite -no-use-gold-linker -no-kms \ + -opengl desktop -qpa xcb -xcb -xcb-xlib -feature-xlib -system-freetype -fontconfig -glib \ + -no-dbus -no-feature-qml-worker-script -no-linuxfb -no-openssl -no-sql-sqlite -no-kms -no-use-gold-linker \ -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \ -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d \ - -skip qtdoc -skip qtquickcontrols -skip qtquickcontrols2 -skip qtspeech -skip qtgamepad \ - -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing -optimize-size \ + -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing \ -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttools \ -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview \ -skip qtwinextras -skip qtx11extras -skip gamepad -skip serialbus -skip location -skip webengine \ - -skip qtdeclarative \ - -no-feature-cups -no-feature-ftp -no-feature-pdf -no-feature-animation \ -nomake examples -nomake tests -nomake tools && \ make -j$THREADS && \ make -j$THREADS install && \ diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e35a7d8..89c32df 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -273,13 +273,6 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) : } } - if(config()->get(Config::warnOnAlpha).toBool()) { - QString warning = "WOWlet is currently in beta.\n\nPlease report any bugs " - "you encounter on our Git repository, IRC freenode #wownero or on /r/Wownero."; - QMessageBox::warning(this, "Beta Warning", warning); - config()->set(Config::warnOnAlpha, false); - } - // settings connects connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateFiatBalanceWidget); connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateWowWidget); diff --git a/src/utils/config.cpp b/src/utils/config.cpp index 2e9b125..ea90c53 100644 --- a/src/utils/config.cpp +++ b/src/utils/config.cpp @@ -21,7 +21,6 @@ static const QHash configStrings = { {Config::checkForAppUpdates,{QS("checkForAppUpdates"), true}}, {Config::warnOnStagenet,{QS("warnOnStagenet"), true}}, {Config::warnOnTestnet,{QS("warnOnTestnet"), true}}, - {Config::warnOnAlpha,{QS("warnOnAlpha"), true}}, {Config::homeWidget,{QS("homeWidget"), 0}}, {Config::skin,{QS("skin"), "light"}}, {Config::openVRSkin,{QS("openVRSkin"), "default"}}, diff --git a/src/utils/config.h b/src/utils/config.h index 7095696..6e75adc 100644 --- a/src/utils/config.h +++ b/src/utils/config.h @@ -23,7 +23,6 @@ public: checkForAppUpdates, warnOnStagenet, warnOnTestnet, - warnOnAlpha, homeWidget, autoOpenWalletPath, skin,