Commit ed798519 authored by Dmitry Kazakov's avatar Dmitry Kazakov

Fix compile errors after the merge

parent 9bc2878b
......@@ -23,10 +23,11 @@
#include <QBrush>
#include <QPalette>
#include <kglobal.h>
#include "kis_debug.h"
#include <QGlobalStatic>
Q_GLOBAL_STATIC(TimelineColorScheme, s_instance)
struct TimelineColorScheme::Private
{
......@@ -46,7 +47,6 @@ TimelineColorScheme::~TimelineColorScheme()
TimelineColorScheme* TimelineColorScheme::instance()
{
K_GLOBAL_STATIC(TimelineColorScheme, s_instance);
return s_instance;
}
......
......@@ -34,7 +34,7 @@
#include <QMenu>
#include <QScrollBar>
#include <QIcon>
#include <QDrag>
#include "kis_debug.h"
#include "timeline_frames_item_delegate.h"
......
......@@ -19,13 +19,14 @@
#include "timeline_ruler_header.h"
#include <limits>
#include <klocale.h>
#include <QMenu>
#include <QAction>
#include <QPainter>
#include <QPaintEvent>
#include <klocalizedstring.h>
#include "timeline_frames_model.h"
#include "timeline_color_scheme.h"
......
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