make it build in flatpak
parent
65c39c3c92
commit
243e48a361
|
|
@ -70,9 +70,9 @@ QMAKE_EXTRA_TARGETS += osxinstaller
|
|||
# Generic linux desktop
|
||||
linux:!android: {
|
||||
desktopfile.files = $${PACKAGE_BASE_DIR}/linux-common/$${APPLICATION_NAME}.desktop
|
||||
desktopfile.path = /usr/share/applications/
|
||||
desktopfile.path = $${QT_INSTALL_DATA}/applications/
|
||||
icons.files = $${PACKAGE_BASE_DIR}/linux-common/icons/
|
||||
icons.path = /usr/share/
|
||||
icons.path = $${QT_INSTALL_DATA}
|
||||
INSTALLS += desktopfile icons
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ TARGET=$${APPLICATION_NAME}
|
|||
CONFIG += link_pkgconfig
|
||||
|
||||
QT += network qml quick quickcontrols2 svg websockets bluetooth charts gui-private nfc
|
||||
!ubports: QT += webview
|
||||
#!ubports: QT += webview
|
||||
|
||||
INCLUDEPATH += $$top_srcdir/libnymea-app
|
||||
LIBS += -L$$top_builddir/libnymea-app/ -lnymea-app
|
||||
|
|
@ -215,7 +215,8 @@ win32 {
|
|||
}
|
||||
}
|
||||
|
||||
target.path = /usr/bin
|
||||
target.path = $${QT_INSTALL_PREFIX}/bin/
|
||||
message("********************* installing to $${QT_INSTALL_BINS}")
|
||||
INSTALLS += target
|
||||
|
||||
DISTFILES +=
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@
|
|||
Q_DECLARE_LOGGING_CATEGORY(dcPlatformIntegration)
|
||||
|
||||
#include <QProcess>
|
||||
#include <QtWebView>
|
||||
//#include <QtWebView>
|
||||
|
||||
PlatformHelperGeneric::PlatformHelperGeneric(QObject *parent) : PlatformHelper(parent)
|
||||
{
|
||||
QtWebView::initialize();
|
||||
// QtWebView::initialize();
|
||||
m_screenHelper = new ScreenHelper(this);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue