pull/49/head
Michael Zanetti 2018-08-02 23:27:49 +02:00
parent 522881d85b
commit bf782749a7
5 changed files with 13 additions and 4 deletions

View File

@ -1,6 +1,7 @@
{
"template": "qmake",
"kill": "nymeaapp",
"kill": "nymea-app",
"build_args": "CONFIG+=ubuntu",
"dependencies": [
"libavahi-client-dev",
"libavahi-common-dev"

View File

@ -3,7 +3,7 @@ TEMPLATE = lib
CONFIG += staticlib
include(../config.pri)
!win32: {
!win32:!ubuntu: {
# To enable this on Windows we'd need to install Bonjour
# https://support.apple.com/kb/DL999
DEFINES += QZEROCONF_STATIC

View File

@ -1,6 +1,6 @@
[Desktop Entry]
Name=nymea:app
Exec=nymeaapp
Exec=usr/bin/nymea-app
Icon=appicon.svg
Terminal=false
Type=Application

View File

@ -1,6 +1,5 @@
include(config.pri)
message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})")
TEMPLATE=subdirs
SUBDIRS = libnymea-common libnymea-app-core nymea-app

View File

@ -56,6 +56,15 @@ QObject *platformHelperProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
int main(int argc, char *argv[])
{
QByteArray gridUnits = qgetenv("GRID_UNIT_PX");
qDebug() << "grid units" << gridUnits;
bool ok;
int gu = gridUnits.toInt(&ok);
if (ok && gu > 0) {
qreal scale = 1.0 * qRound(2.0 * gu / 8) / 2;
qDebug() << "Setting scale factor to" << scale;
qputenv("QT_SCALE_FACTOR", QByteArray::number(scale));
}
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication application(argc, argv);