Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[OS/2] Another OS/2 build fixes

Browse Source
This commit is contained in:
nowrep 2014-01-02 15:26:44 +01:00
parent 68cdba9e3a
commit e6fe3ad917
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/app/mainapplication.h
View File

@ -28,6 +28,7 @@
#include "qtsingleapplication.h"
#include "qz_namespace.h"
class QMenu;
class QWebSettings;
class QNetworkDiskCache;
@ -52,9 +53,9 @@ class ProxyStyle;
class RegisterQAppAssociation;
class HTML5PermissionsManager;
class Speller;
#ifdef Q_OS_MAC
class MacMenuReceiver;
class QMenu;
#endif
class QT_QUPZILLA_EXPORT MainApplication : public QtSingleApplication
@ -125,7 +126,7 @@ public:
UserAgentManager* uaManager() { return m_uaManager; }
RestoreManager* restoreManager() { return m_restoreManager; }
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
RegisterQAppAssociation* associationManager();
#endif
@ -204,9 +205,10 @@ private:
bool m_databaseConnected;
QList<PostLaunchAction> m_postLaunchActions;
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
RegisterQAppAssociation* m_registerQAppAssociation;
#endif
#ifdef Q_OS_MAC
MacMenuReceiver* m_macMenuReceiver;
QMenu* m_macDockMenu;

6
src/lib/preferences/preferences.cpp
View File

@ -113,7 +113,8 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
ui->afterLaunch->setCurrentIndex(afterLaunch);
ui->checkUpdates->setChecked(settings.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool());
ui->dontLoadTabsUntilSelected->setChecked(settings.value("Web-Browser-Settings/LoadTabsOnActivation", false).toBool());
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
ui->checkDefaultBrowser->setChecked(settings.value("Web-Browser-Settings/CheckDefaultBrowser", DEFAULT_CHECK_DEFAULTBROWSER).toBool());
if (mApp->associationManager()->isDefaultForAllCapabilities()) {
ui->checkNowDefaultBrowser->setText(tr("Default"));
@ -124,13 +125,14 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
ui->checkNowDefaultBrowser->setEnabled(true);
connect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeQupZillaDefault()));
}
#else // just Windows
#else // No Default Browser settings on non-Windows platform
ui->hSpacerDefaultBrowser->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
ui->hLayoutDefaultBrowser->invalidate();
delete ui->hLayoutDefaultBrowser;
delete ui->checkDefaultBrowser;
delete ui->checkNowDefaultBrowser;
#endif
ui->newTabFrame->setVisible(false);
if (m_newTabUrl.isEmpty()) {
ui->newTab->setCurrentIndex(0);