Fix build without Qt4 headers.

This commit is contained in:
Jonas Kvinge 2018-03-31 16:49:27 +02:00
parent 01c02c3b55
commit 0fcd66cef2
4 changed files with 22 additions and 11 deletions

View File

@ -28,6 +28,7 @@
#include <memory> #include <memory>
#include <cmath> #include <cmath>
#include <QMainWindow>
#include <QCloseEvent> #include <QCloseEvent>
#include <QDir> #include <QDir>
#include <QFileDialog> #include <QFileDialog>
@ -38,11 +39,15 @@
#include <QSettings> #include <QSettings>
#include <QShortcut> #include <QShortcut>
#include <QSignalMapper> #include <QSignalMapper>
#include <QSortFilterProxyModel>
#include <QStatusBar> #include <QStatusBar>
#include <QtDebug> #include <QtDebug>
#include <QTimer> #include <QTimer>
#include <QUndoStack> #include <QUndoStack>
#include <QSystemTrayIcon>
#include <QAction>
#include <QList>
#include <QModelIndex>
#include <QSortFilterProxyModel>
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
#include <qtsparkle/Updater> #include <qtsparkle/Updater>

View File

@ -28,6 +28,12 @@
#include <QMainWindow> #include <QMainWindow>
#include <QSettings> #include <QSettings>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QAction>
#include <QTimer>
#include <QMenu>
#include <QList>
#include <QModelIndex>
#include <QSortFilterProxyModel>
#include "core/lazy.h" #include "core/lazy.h"
#include "core/mac_startup.h" #include "core/mac_startup.h"

View File

@ -29,14 +29,14 @@
#include "stylehelper.h" #include "stylehelper.h"
#include <QtGui/QPixmapCache> #include <QObject>
#include <QtGui/QWidget> #include <QWidget>
#include <QtCore/QRect> #include <QApplication>
#include <QtGui/QPainter> #include <QPainter>
#include <QtGui/QApplication> #include <QPalette>
#include <QtGui/QPalette> #include <QRect>
#include <QtGui/QStyleOption> #include <QPixmapCache>
#include <QtCore/QObject> #include <QStyleOption>
// Clamps float color values within (0, 255) // Clamps float color values within (0, 255)
static int clamp(float x) static int clamp(float x)

View File

@ -30,8 +30,8 @@
#ifndef STYLEHELPER_H #ifndef STYLEHELPER_H
#define STYLEHELPER_H #define STYLEHELPER_H
#include <QtGui/QColor> #include <QColor>
#include <QtGui/QStyle> #include <QStyle>
#include "core/qt_blurimage.h" #include "core/qt_blurimage.h"