Commit ab9fd247 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau

Merge branch 'Applications/17.04'

parents 1e76b784 4fc3eefc
......@@ -22,4 +22,8 @@
#include "oktetacore.h"
#if QT_VERSION >= 0x050500
Q_LOGGING_CATEGORY(LOG_OKTETA_CORE, "okteta.core", QtInfoMsg)
#else
Q_LOGGING_CATEGORY(LOG_OKTETA_CORE, "okteta.core")
#endif
......@@ -22,4 +22,8 @@
#include "oktetagui.h"
#if QT_VERSION >= 0x050500
Q_LOGGING_CATEGORY(LOG_OKTETA_GUI, "okteta.gui", QtInfoMsg)
#else
Q_LOGGING_CATEGORY(LOG_OKTETA_GUI, "okteta.gui")
#endif
......@@ -22,4 +22,8 @@
#include "checksumlogging.h"
#if QT_VERSION >= 0x050500
Q_LOGGING_CATEGORY(LOG_OKTETA_KASTEN_CONTROLLER_CHECKSUM, "kasten.okteta.controllers.checksum", QtInfoMsg)
#else
Q_LOGGING_CATEGORY(LOG_OKTETA_KASTEN_CONTROLLER_CHECKSUM, "kasten.okteta.controllers.checksum")
#endif
......@@ -22,4 +22,8 @@
#include "structlogging.h"
#if QT_VERSION >= 0x050500
Q_LOGGING_CATEGORY(LOG_KASTEN_OKTETA_CONTROLLERS_STRUCTURES, "kasten.okteta.controllers.structures", QtInfoMsg)
#else
Q_LOGGING_CATEGORY(LOG_KASTEN_OKTETA_CONTROLLERS_STRUCTURES, "kasten.okteta.controllers.structures")
#endif
......@@ -22,4 +22,8 @@
#include "oktetakastengui.h"
#if QT_VERSION >= 0x050500
Q_LOGGING_CATEGORY(LOG_KASTEN_OKTETA_GUI, "kasten.okteta.gui", QtInfoMsg)
#else
Q_LOGGING_CATEGORY(LOG_KASTEN_OKTETA_GUI, "kasten.okteta.gui")
#endif
......@@ -22,4 +22,8 @@
#include "kastencore.h"
#if QT_VERSION >= 0x050500
Q_LOGGING_CATEGORY(LOG_KASTEN_CORE, "kasten.core", QtInfoMsg)
#else
Q_LOGGING_CATEGORY(LOG_KASTEN_CORE, "kasten.core")
#endif
......@@ -22,4 +22,8 @@
#include "kastengui.h"
#if QT_VERSION >= 0x050500
Q_LOGGING_CATEGORY(LOG_KASTEN_GUI, "kasten.gui", QtInfoMsg)
#else
Q_LOGGING_CATEGORY(LOG_KASTEN_GUI, "kasten.gui")
#endif
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
<gui name="oktetapartbrowser" version="2" translationDomain="oktetapart">
<MenuBar>
......
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
<gui name="oktetapartreadonly" version="2" translationDomain="oktetapart">
<MenuBar>
......
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
<gui name="oktetapartreadwrite" version="2" translationDomain="oktetapart">
<MenuBar>
......
<!DOCTYPE kpartgui>
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
<gui name="Okteta" version="4">
<MenuBar>
<Menu name="file">
......
......@@ -64,17 +64,19 @@ namespace Kasten
OktetaProgram::OktetaProgram( int &argc, char* argv[] )
: mApp( argc, argv )
{
#if QT_VERSION < 0x050500
#ifndef QT_NO_DEBUG
// MSVC complains about mismatched strings... (wide vs normal)
// fix it using QT_UNICODE_LITERAL
QLoggingCategory::setFilterRules(QStringLiteral(
"okteta.core.debug = true\n"
QT_UNICODE_LITERAL("okteta.gui.debug = true\n")
QT_UNICODE_LITERAL("kasten.core.debug = true\n")
QT_UNICODE_LITERAL("kasten.gui.debug = true\n")
QT_UNICODE_LITERAL("kasten.okteta.core = true\n")
QT_UNICODE_LITERAL("kasten.okteta.gui = true\n")
QT_UNICODE_LITERAL("kasten.okteta.controllers.structures.debug = true\n")));
"okteta.core.debug = false\n"
QT_UNICODE_LITERAL("okteta.gui.debug = false\n")
QT_UNICODE_LITERAL("kasten.core.debug = false\n")
QT_UNICODE_LITERAL("kasten.gui.debug = false\n")
QT_UNICODE_LITERAL("kasten.okteta.core = false\n")
QT_UNICODE_LITERAL("kasten.okteta.gui = false\n")
QT_UNICODE_LITERAL("kasten.okteta.controllers.structures.debug = false\n")));
#endif
#endif
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment