From aac9067fb9d15f8f40a4f64b8971d3ec59d8a36d Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Tue, 21 Feb 2017 00:33:33 +0900
Subject: [PATCH] Code cleanup
---
ocs-url.pro | 4 ++--
pkg/arch/PKGBUILD | 2 +-
pkg/fedora/ocs-url.spec | 2 +-
pkg/snap/snapcraft.yaml | 2 +-
pkg/ubuntu/debian/rules | 2 +-
src/app/main.cpp | 5 -----
6 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/ocs-url.pro b/ocs-url.pro
index 1eae938..304f583 100644
--- a/ocs-url.pro
+++ b/ocs-url.pro
@@ -24,8 +24,8 @@ DISTFILES += \
pkg/snap/setup/gui/ocs-url.desktop \
pkg/appimage/appimage-desktopintegration
-include(deployment.pri)
-
include(src/lib/qtlib/qtlib.pri)
include(src/app/app.pri)
+
+include(deployment.pri)
diff --git a/pkg/arch/PKGBUILD b/pkg/arch/PKGBUILD
index e5157d4..04e23f2 100644
--- a/pkg/arch/PKGBUILD
+++ b/pkg/arch/PKGBUILD
@@ -15,7 +15,7 @@ md5sums=() #autofill using updpkgsums
build() {
#cd "${pkgname}-release-${pkgver}"
cd "${pkgname}"
- qmake PREFIX='/usr'
+ qmake PREFIX="/usr"
make
}
diff --git a/pkg/fedora/ocs-url.spec b/pkg/fedora/ocs-url.spec
index aeae496..7c4a226 100644
--- a/pkg/fedora/ocs-url.spec
+++ b/pkg/fedora/ocs-url.spec
@@ -21,7 +21,7 @@ An install helper program for desktop stuff.
%build
%define debug_package %{nil}
-qmake-qt5 PREFIX='/usr'
+qmake-qt5 PREFIX="/usr"
make
%install
diff --git a/pkg/snap/snapcraft.yaml b/pkg/snap/snapcraft.yaml
index 89828dc..a4292c4 100644
--- a/pkg/snap/snapcraft.yaml
+++ b/pkg/snap/snapcraft.yaml
@@ -15,7 +15,7 @@ parts:
source: ../../
qt-version: qt5
options:
- - PREFIX='/usr'
+ - PREFIX="/usr"
build-packages:
- build-essential
- qt5-default
diff --git a/pkg/ubuntu/debian/rules b/pkg/ubuntu/debian/rules
index 05dde70..3fc604c 100755
--- a/pkg/ubuntu/debian/rules
+++ b/pkg/ubuntu/debian/rules
@@ -4,7 +4,7 @@
dh $@
override_dh_auto_configure:
- qmake PREFIX='/usr'
+ qmake PREFIX="/usr"
override_dh_auto_install:
make INSTALL_ROOT="$(CURDIR)/debian/tmp" install
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 3d60d07..91d81a3 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,10 +1,8 @@
-//#include <QtGlobal>
#include <QString>
#include <QStringList>
#include <QUrl>
#include <QJsonObject>
#include <QCommandLineParser>
-//#include <QCoreApplication>
#include <QGuiApplication>
#include <QIcon>
#include <QQmlApplicationEngine>
@@ -17,9 +15,6 @@
int main(int argc, char *argv[])
{
// Init
-//#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-// QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-//#endif
QGuiApplication app(argc, argv);
qtlib::Config config(":/configs");
--
GitLab