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] Build fix

Browse Source
This commit is contained in:
nowrep 2014-01-01 23:15:50 +01:00
parent 4e4e653f9f
commit d58ad2e6a1
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/app/mainapplication.cpp
View File

@ -110,7 +110,7 @@ MainApplication::MainApplication(int &argc, char** argv)
, m_isRestoring(false)
, m_startingAfterCrash(false)
, m_databaseConnected(false)
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
, m_registerQAppAssociation(0)
#endif
#ifdef Q_OS_MAC
@ -1019,7 +1019,7 @@ void MainApplication::reloadUserStyleSheet()
bool MainApplication::checkDefaultWebBrowser()
{
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
bool showAgain = true;
if (!associationManager()->isDefaultForAllCapabilities()) {
CheckBoxDialog dialog(QDialogButtonBox::Yes | QDialogButtonBox::No, getWindow());
@ -1042,7 +1042,7 @@ bool MainApplication::checkDefaultWebBrowser()
#endif
}
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
RegisterQAppAssociation* MainApplication::associationManager()
{
if (!m_registerQAppAssociation) {

4
src/lib/lib.pro
View File

@ -520,6 +520,10 @@ win32 {
LIBS += -llibeay32
}
os2 {
LIBS += -llibeay32
}
mac {
HEADERS += other/macmenureceiver.h \
webview/macwebviewscroller.h

4
src/lib/other/registerqappassociation.h
View File

@ -31,7 +31,7 @@ class QT_QUPZILLA_EXPORT RegisterQAppAssociation : public QObject
public:
explicit RegisterQAppAssociation(QObject* parent = 0);
explicit RegisterQAppAssociation(const QString &appRegisteredName, const QString &appPath,
const QString &appIcon = "", const QString &appDesc = "", QObject* parent = 0);
const QString &appIcon = QString(), const QString &appDesc = QString(), QObject* parent = 0);
~RegisterQAppAssociation();
enum AssociationType {
@ -44,7 +44,7 @@ public:
void removeCapability(const QString &assocName);
void setAppInfo(const QString &appRegisteredName, const QString &appPath,
const QString &appIcon = "", const QString &appDesc = "");
const QString &appIcon = QString(), const QString &appDesc = QString());
bool isPerMachineRegisteration();
void setPerMachineRegisteration(bool enable);

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

@ -538,7 +538,7 @@ void Preferences::setNotificationPreviewVisible(bool state)
void Preferences::makeQupZillaDefault()
{
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
disconnect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeQupZillaDefault()));
mApp->associationManager()->registerAllAssociation();
ui->checkNowDefaultBrowser->setText(tr("Default"));