Bump version, add poll, no release yet.

pri/build_opts.pri

@@ -46,7 +46,7 @@ MOC_DIR = $$OUT_PWD/moc
 RCC_DIR = $$OUT_PWD/rcc
 UI_DIR = $$OUT_PWD/ui
 
-mac {
+mac:qtHaveModule(macextras) {
   QT *= macextras
 }
 

pri/vars.pri

@@ -4,7 +4,7 @@ APP_REVERSE_NAME              = "com.github.rssguard"
 APP_LOW_H_NAME                = ".rssguard"
 APP_AUTHOR                    = "Martin Rotter"
 APP_COPYRIGHT                 = "(C) 2011-2020 $$APP_AUTHOR"
-APP_VERSION                   = "3.6.1"
+APP_VERSION                   = "3.6.2"
 APP_LONG_NAME                 = "$$APP_NAME $$APP_VERSION"
 APP_EMAIL                     = "rotter.martinos@gmail.com"
 APP_URL                       = "https://github.com/martinrotter/rssguard"

resources/desktop/com.github.rssguard.appdata.xml

@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.6.1" date="2020-05-13"/>
+    <release version="3.6.1" date="2020-05-14"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>

src/librssguard/miscellaneous/application.cpp

@@ -110,7 +110,7 @@ void Application::loadDynamicShortcuts() {
 
 void Application::showPolls() const {
   if (isFirstRun(APP_VERSION)) {
-    //web()->openUrlInExternalBrowser(QSL("https://goo.gl/forms/7bJNr33Ii22Q1c3k2"));
+    web()->openUrlInExternalBrowser(QSL("https://forms.gle/GXw1gNksRZDfSccL7"));
   }
 }
 

src/librssguard/network-web/basenetworkaccessmanager.cpp

@@ -15,8 +15,6 @@ BaseNetworkAccessManager::BaseNetworkAccessManager(QObject* parent)
   loadSettings();
 }
 
-BaseNetworkAccessManager::~BaseNetworkAccessManager() = default;
-
 void BaseNetworkAccessManager::loadSettings() {
   QNetworkProxy new_proxy;
   const QNetworkProxy::ProxyType selected_proxy_type = static_cast<QNetworkProxy::ProxyType>(qApp->settings()->value(GROUP(Proxy),

src/librssguard/network-web/basenetworkaccessmanager.h

@@ -12,8 +12,7 @@ class BaseNetworkAccessManager : public QNetworkAccessManager {
   public:
 
     // Constructors and desctructors.
-    explicit BaseNetworkAccessManager(QObject* parent = 0);
-    virtual ~BaseNetworkAccessManager();
+    explicit BaseNetworkAccessManager(QObject* parent = nullptr);
 
   public slots:
 

src/librssguard/network-web/googlesuggest.h

@@ -45,7 +45,7 @@ class GoogleSuggest : public QObject {
   public:
 
     // Constructors.
-    explicit GoogleSuggest(LocationLineEdit* editor, QObject* parent = 0);
+    explicit GoogleSuggest(LocationLineEdit* editor, QObject* parent = nullptr);
     virtual ~GoogleSuggest();
 
     bool eventFilter(QObject* object, QEvent* event);

src/librssguard/network-web/oauth2service.h

@@ -40,7 +40,7 @@ class OAuth2Service : public QObject {
   public:
     explicit OAuth2Service(const QString& auth_url, const QString& token_url,
                            const QString& client_id, const QString& client_secret,
-                           const QString& scope, QObject* parent = 0);
+                           const QString& scope, QObject* parent = nullptr);
 
     // Returns bearer HTTP header value.
     // NOTE: Only call this if isFullyLoggedIn()

src/librssguard/network-web/silentnetworkaccessmanager.h

@@ -15,7 +15,7 @@ class SilentNetworkAccessManager : public BaseNetworkAccessManager {
   public:
 
     // Constructors and destructors.
-    explicit SilentNetworkAccessManager(QObject* parent = 0);
+    explicit SilentNetworkAccessManager(QObject* parent = nullptr);
     virtual ~SilentNetworkAccessManager();
 
     // Returns pointer to global silent network manager

src/librssguard/network-web/webpage.h

@@ -18,7 +18,7 @@ class WebPage : public QWebEnginePage {
       MarkUnstarred
     };
 
-    explicit WebPage(QObject* parent = 0);
+    explicit WebPage(QObject* parent = nullptr);
 
     WebViewer* view() const;
 

src/librssguard/services/abstract/accountcheckmodel.h

@@ -13,7 +13,7 @@ class AccountCheckModel : public QAbstractItemModel {
   public:
 
     // Constructors and destructors.
-    explicit AccountCheckModel(QObject* parent = 0);
+    explicit AccountCheckModel(QObject* parent = nullptr);
     virtual ~AccountCheckModel();
 
     QModelIndex index(int row, int column, const QModelIndex& parent) const;