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

Cleanup displayed build configuration flags in qupzilla:config

Browse Source 
Removed KDE Integration and WebGL. Both flags don't have much use now.
KDE Integration only enables KWallet plugin building (and only when
KWallet-dev is available).
WebGL is now enabled by default by any recent QtWebKit versions.

Also show Win7API flag only on Windows.
This commit is contained in:
David Rosca 2014-11-01 10:14:04 +01:00
parent 5779b6b835
commit 9359977d8b
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/network/schemehandlers/qupzillaschemehandler.cpp
View File

@ -417,31 +417,21 @@ QString QupZillaSchemeReply::configPage()
QString debugBuild = tr("Disabled");
#endif
#if defined (USE_WEBGL) || (QTWEBKIT_FROM_2_3 && defined(Q_OS_UNIX))
QString webGLEnabled = tr("<b>Enabled</b>");
#else
QString webGLEnabled = tr("Disabled");
#endif
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && defined(W7API)
QString w7APIEnabled = tr("<b>Enabled</b>");
#else
QString w7APIEnabled = tr("Disabled");
#endif
#if defined(Q_OS_UNIX) && defined(KDE_INTEGRATION)
QString KDEIntegration = tr("<b>Enabled</b>");
#else
QString KDEIntegration = tr("Disabled");
#endif
QString portableBuild = mApp->isPortable() ? tr("<b>Enabled</b>") : tr("Disabled");
cPage.replace(QLatin1String("%BUILD-CONFIG-TEXT%"),
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Debug build"), debugBuild) +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("WebGL support"), webGLEnabled) +
#ifdef Q_OS_WIN
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Windows 7 API"), w7APIEnabled) +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("KDE integration"), KDEIntegration) +
#endif
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Portable build"), portableBuild));
cPage = QzTools::applyDirectionToPage(cPage);