From 9867a6b6279229d53fe59854a511c9eea9888427 Mon Sep 17 00:00:00 2001 From: Keshav Bhatt Date: Mon, 28 Feb 2022 18:08:28 +0530 Subject: build: migrate to qt 5.15 --- src/main.cpp | 96 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 46 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 1b3881e..7f94a3d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,67 +1,71 @@ #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include "mainwindow.h" -#include "rungaurd.h" #include "common.h" +#include "rungaurd.h" +int main(int argc, char *argv[]) { + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + static const char ENV_VAR_QT_DEVICE_PIXEL_RATIO[] = "QT_DEVICE_PIXEL_RATIO"; + if (!qEnvironmentVariableIsSet(ENV_VAR_QT_DEVICE_PIXEL_RATIO) && + !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR") && + !qEnvironmentVariableIsSet("QT_SCALE_FACTOR") && + !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) { + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + } -int main(int argc, char *argv[]) -{ - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - static const char ENV_VAR_QT_DEVICE_PIXEL_RATIO[] = "QT_DEVICE_PIXEL_RATIO"; - if (!qEnvironmentVariableIsSet(ENV_VAR_QT_DEVICE_PIXEL_RATIO) - && !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR") - && !qEnvironmentVariableIsSet("QT_SCALE_FACTOR") - && !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - } - - QApplication app(argc, argv); - app.setWindowIcon(QIcon(":/icons/app/icon-256.png")); + QApplication app(argc, argv); + app.setWindowIcon(QIcon(":/icons/app/icon-256.png")); - QApplication::setApplicationName("WhatSie"); - QApplication::setOrganizationName("org.keshavnrj.ubuntu"); - QApplication::setApplicationVersion(VERSIONSTR); + QApplication::setApplicationName("WhatSie"); + QApplication::setOrganizationName("org.keshavnrj.ubuntu"); + QApplication::setApplicationVersion(VERSIONSTR); - QString appname = QApplication::applicationName(); + QString appname = QApplication::applicationName(); - //allow multiple instances in debug builds - #ifndef QT_DEBUG - RunGuard guard("org.keshavnrj.ubuntu."+appname); - if ( !guard.tryToRun() ){ - QMessageBox::critical(0, appname,"An instance of "+appname+" is already running."); - return 0; - } - #endif +// allow multiple instances in debug builds +#ifndef QT_DEBUG + RunGuard guard("org.keshavnrj.ubuntu." + appname); + if (!guard.tryToRun()) { + QMessageBox::critical(0, appname, + "An instance of " + appname + " is already running."); + return 0; + } +#endif - qputenv("QTWEBENGINE_CHROMIUM_FLAGS","--single-process"); + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--single-process"); #ifdef QT_DEBUG - qputenv("QTWEBENGINE_CHROMIUM_FLAGS","--remote-debugging-port=9421"); + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--remote-debugging-port=9421"); #endif - qputenv("QTWEBENGINE_CHROMIUM_FLAGS","--disable-logging"); + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-logging"); - QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::PluginsEnabled, true); - QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true); - QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, true); + QWebEngineSettings::defaultSettings()->setAttribute( + QWebEngineSettings::PluginsEnabled, true); + QWebEngineSettings::defaultSettings()->setAttribute( + QWebEngineSettings::DnsPrefetchEnabled, true); + QWebEngineSettings::defaultSettings()->setAttribute( + QWebEngineSettings::FullScreenSupportEnabled, true); + QWebEngineSettings::defaultSettings()->setAttribute( + QWebEngineSettings::JavascriptCanAccessClipboard, true); - MainWindow window; + MainWindow window; - QStringList argsList = app.arguments(); - qWarning()<<"Launching with argument"<