From 37236903b2ffcab79a2ce9558b19e58dd4f37ab4 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 26 Jul 2017 10:22:24 +0200 Subject: [PATCH] Fix warnings for x64. --- resources/binaries | 2 +- resources/scripts/astyle/.astylerc | 25 ++++++++++++++++++++++++ rssguard.pro | 26 ++++++++----------------- src/gui/dialogs/formupdate.cpp | 2 +- src/network-web/adblock/adblockicon.cpp | 1 - 5 files changed, 35 insertions(+), 21 deletions(-) create mode 100755 resources/scripts/astyle/.astylerc diff --git a/resources/binaries b/resources/binaries index 5192d9954..e2fb756e2 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit 5192d99546902c5f245161372a4b0cc9669237fd +Subproject commit e2fb756e2b3ac85b196129664e8a4d92581ac45a diff --git a/resources/scripts/astyle/.astylerc b/resources/scripts/astyle/.astylerc new file mode 100755 index 000000000..310eab12b --- /dev/null +++ b/resources/scripts/astyle/.astylerc @@ -0,0 +1,25 @@ +--style=java +--indent=spaces=2 +--indent-classes +--indent-namespaces +--indent-switches +--indent-labels +--indent-preproc-define +--indent-col1-comments +--max-continuation-indent=100 +--break-blocks +--unpad-paren +--pad-oper +--pad-comma +--pad-header +--align-pointer=type +--align-reference=type +--break-closing-braces +--break-one-line-headers +--add-braces +--convert-tabs +--close-templates +--max-code-length=140 +--lineend=linux +-t -p +-M60Ucv \ No newline at end of file diff --git a/rssguard.pro b/rssguard.pro index d6f2fdb89..d34da2d76 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -74,7 +74,7 @@ APP_LOW_NAME = "rssguard" APP_LOW_H_NAME = ".rssguard" APP_AUTHOR = "Martin Rotter" APP_COPYRIGHT = "(C) 2011-2016 $$APP_AUTHOR" -APP_VERSION = "3.4.1" +APP_VERSION = "3.4.2" APP_LONG_NAME = "$$APP_NAME $$APP_VERSION" APP_EMAIL = "rotter.martinos@gmail.com" APP_URL = "https://github.com/martinrotter/rssguard" @@ -690,20 +690,8 @@ win32 { qt_dlls_root.files = resources/binaries/windows/qt5-msvc2015/*.* qt_dlls_root.path = $$quote($$PREFIX/) - qt_dlls_bearer.files = resources/binaries/windows/qt5-msvc2015/bearer - qt_dlls_bearer.path = $$quote($$PREFIX/) - - qt_dlls_iconengines.files = resources/binaries/windows/qt5-msvc2015/iconengines - qt_dlls_iconengines.path = $$quote($$PREFIX/) - - qt_dlls_imageformats.files = resources/binaries/windows/qt5-msvc2015/imageformats - qt_dlls_imageformats.path = $$quote($$PREFIX/) - - qt_dlls_platforms.files = resources/binaries/windows/qt5-msvc2015/platforms/ - qt_dlls_platforms.path = $$quote($$PREFIX/) - - qt_dlls_sqldrivers.files = resources/binaries/windows/qt5-msvc2015/sqldrivers - qt_dlls_sqldrivers.path = $$quote($$PREFIX/) + qt_dlls_plugins.files = resources/binaries/windows/qt5-msvc2015/* + qt_dlls_plugins.path = $$quote($$PREFIX/) misc_icons.files = resources/graphics/misc misc_icons.path = $$quote($$PREFIX/icons/) @@ -732,8 +720,7 @@ win32 { translations.files = $$OUT_PWD/translations translations.path = $$quote($$PREFIX/) - INSTALLS += target misc_sql qt_dlls_root qt_dlls_bearer qt_dlls_iconengines \ - qt_dlls_imageformats qt_dlls_platforms qt_dlls_sqldrivers \ + INSTALLS += target misc_sql qt_dlls_root qt_dlls_plugins \ misc_icons faenza skins \ feeds texts ico app_icon app_plain_icon translations @@ -745,13 +732,16 @@ win32 { qtwebengine_resources.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/resources qtwebengine_resources.path = $$quote($$PREFIX/) + qtwebengine_dlls_print.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/printsupport + qtwebengine_dlls_print.path = $$quote($$PREFIX/) + qtwebengine_position.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/position qtwebengine_position.path = $$quote($$PREFIX/) qtwebengine_dlls.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/*.* qtwebengine_dlls.path = $$quote($$PREFIX/) - INSTALLS += qtwebengine_translations qtwebengine_resources qtwebengine_position qtwebengine_dlls + INSTALLS += qtwebengine_translations qtwebengine_resources qtwebengine_dlls_print qtwebengine_position qtwebengine_dlls } } diff --git a/src/gui/dialogs/formupdate.cpp b/src/gui/dialogs/formupdate.cpp index 68fd72bfb..69065f3cd 100755 --- a/src/gui/dialogs/formupdate.cpp +++ b/src/gui/dialogs/formupdate.cpp @@ -218,7 +218,7 @@ void FormUpdate::startUpdate() { nullptr, SW_NORMAL); - if (((int)exec_result) <= 32) { + if (exec_result <= (HINSTANCE)32) { qDebug("External updater was not launched due to error."); qApp->showGuiMessage(tr("Cannot update application"), tr("Cannot launch external updater. Update application manually."), diff --git a/src/network-web/adblock/adblockicon.cpp b/src/network-web/adblock/adblockicon.cpp index c67c5e883..8e14e2b63 100755 --- a/src/network-web/adblock/adblockicon.cpp +++ b/src/network-web/adblock/adblockicon.cpp @@ -39,7 +39,6 @@ AdBlockIcon::AdBlockIcon(QObject* parent) setMenu(new QMenu()); setIcon(m_enabled ? qApp->icons()->miscIcon(ADBLOCK_ICON_ACTIVE) : qApp->icons()->miscIcon(ADBLOCK_ICON_DISABLED)); - connect(this, SIGNAL(clicked(QPoint)), this, SLOT(showMenu(QPoint))); connect(AdBlockManager::instance(), SIGNAL(enabledChanged(bool)), this, SLOT(setEnabled(bool))); connect(menu(), SIGNAL(aboutToShow()), this, SLOT(createMenu())); connect(this, &QAction::triggered, AdBlockManager::instance(), &AdBlockManager::showDialog);