fix: build without KConfig is possible once more
This commit is contained in:
parent
3cce057545
commit
a04693e39d
@ -16,9 +16,6 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SHARED_DEFINES_H
|
#pragma once
|
||||||
#define SHARED_DEFINES_H
|
|
||||||
|
|
||||||
#define SHARED_UNUSED(x) (void)(x)
|
#define SHARED_UNUSED(x) (void)(x)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include <QFontDatabase>
|
#include <QFontDatabase>
|
||||||
|
|
||||||
|
#include "defines.h"
|
||||||
#include "enums.h"
|
#include "enums.h"
|
||||||
#include "ui/models/roster.h"
|
#include "ui/models/roster.h"
|
||||||
|
|
||||||
@ -361,27 +362,32 @@ void Shared::Global::highlightInFileManager(const QString& path)
|
|||||||
}
|
}
|
||||||
|
|
||||||
QIcon Shared::Global::createThemePreview(const QString& path) {
|
QIcon Shared::Global::createThemePreview(const QString& path) {
|
||||||
|
#ifdef WITH_KCONFIG
|
||||||
if (supported("colorSchemeTools")) {
|
if (supported("colorSchemeTools")) {
|
||||||
QIcon* icon = createPreview(path);
|
QIcon* icon = createPreview(path);
|
||||||
QIcon localIcon = *icon;
|
QIcon localIcon = *icon;
|
||||||
deletePreview(icon);
|
deletePreview(icon);
|
||||||
return localIcon;
|
return localIcon;
|
||||||
} else {
|
|
||||||
return QIcon();
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return QIcon();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Shared::Global::getColorSchemeName(const QString& path) {
|
QString Shared::Global::getColorSchemeName(const QString& path) {
|
||||||
|
#ifdef WITH_KCONFIG
|
||||||
if (supported("colorSchemeTools")) {
|
if (supported("colorSchemeTools")) {
|
||||||
QString res;
|
QString res;
|
||||||
colorSchemeName(path, res);
|
colorSchemeName(path, res);
|
||||||
return res;
|
return res;
|
||||||
} else {
|
|
||||||
return "";
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
void Shared::Global::setTheme(const QString& path) {
|
void Shared::Global::setTheme(const QString& path) {
|
||||||
|
#ifdef WITH_KCONFIG
|
||||||
if (supported("colorSchemeTools")) {
|
if (supported("colorSchemeTools")) {
|
||||||
if (path.toLower() == "system") {
|
if (path.toLower() == "system") {
|
||||||
QApplication::setPalette(getInstance()->defaultSystemPalette);
|
QApplication::setPalette(getInstance()->defaultSystemPalette);
|
||||||
@ -391,6 +397,10 @@ void Shared::Global::setTheme(const QString& path) {
|
|||||||
QApplication::setPalette(pallete);
|
QApplication::setPalette(pallete);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
SHARED_UNUSED(path);
|
||||||
|
qDebug("setTheme() was called, but this version of squawk was compiled without KConfig support, ignoring");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void Shared::Global::setStyle(const QString& style) {
|
void Shared::Global::setStyle(const QString& style) {
|
||||||
|
Loading…
Reference in New Issue
Block a user