diff --git a/krita/gemini/main.cpp b/krita/gemini/main.cpp --- a/krita/gemini/main.cpp +++ b/krita/gemini/main.cpp @@ -31,12 +31,12 @@ #include #include -#include #include #include "data/splash/splash_screen.xpm" #include "MainWindow.h" -#include "sketch/SketchInputContext.h" +// QT5TODO +// #include "sketch/SketchInputContext.h" #include #include @@ -181,9 +181,10 @@ MainWindow window(fileNames); - if (args->isSet("vkb")) { - app.setInputContext(new SketchInputContext(&app)); - } +// QT5TODO +// if (args->isSet("vkb")) { +// app.setInputContext(new SketchInputContext(&app)); +// } if (args->isSet("sketch")) { window.setSlateMode(true); diff --git a/krita/sketch/Theme.cpp b/krita/sketch/Theme.cpp --- a/krita/sketch/Theme.cpp +++ b/krita/sketch/Theme.cpp @@ -368,6 +368,8 @@ QQmlComponent themeComponent(QmlGlobalEngine::instance()->engine(), parent); themeComponent.loadUrl(QUrl::fromLocalFile(qml), QQmlComponent::PreferSynchronous); + warnKrita << "+++++++++++" << themeComponent.url() << themeComponent.progress() << themeComponent.status(); + if(themeComponent.isError()) { warnKrita << themeComponent.errorString(); return 0; diff --git a/krita/ui/opengl/kis_texture_tile.cpp b/krita/ui/opengl/kis_texture_tile.cpp --- a/krita/ui/opengl/kis_texture_tile.cpp +++ b/krita/ui/opengl/kis_texture_tile.cpp @@ -111,9 +111,7 @@ KisTextureTile::~KisTextureTile() { #ifdef USE_PIXEL_BUFFERS - if (m_useBuffer) { - delete m_glBuffer; - } + delete m_glBuffer; #endif f->glDeleteTextures(1, &m_textureId); } @@ -351,6 +349,7 @@ } else { + delete m_glBuffer; m_glBuffer = 0; } } diff --git a/libs/widgetutils/kis_icon_utils.cpp b/libs/widgetutils/kis_icon_utils.cpp --- a/libs/widgetutils/kis_icon_utils.cpp +++ b/libs/widgetutils/kis_icon_utils.cpp @@ -102,7 +102,7 @@ } QIcon icon = QIcon::fromTheme(name); - qWarning() << "\tfalling back on QIcon::FromTheme:" << name; +// qWarning() << "\tfalling back on QIcon::FromTheme:" << name; return icon; }