Commit ee535d61 authored by Jarosław Staniek's avatar Jarosław Staniek

Merge remote branch 'origin/master'

parents 0c8e7dd6 905e78cf

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -193,12 +193,6 @@ endif(OPENGL_FOUND)
macro_log_feature(HAVE_OPENGL "OpenGL" "OpenGL support" "" FALSE "" "Required by parts of Krita and optionally by flake")
##
## Test for create ressources
##
macro_optional_find_package(CreateResources)
macro_log_feature(CREATERESOURCES_FOUND "Create Resources" "Create Resources (brushes, palettes etc.)" "http://create.freedesktop.org" FALSE "" "Recommended at runtime for Calligra for optional extra resources.")
##
## Test for kdepimlibs
##
......@@ -260,9 +254,15 @@ if( MARBLE_FOUND )
##
find_file(MARBLECONTROLBOX_H MarbleControlBox.h ${MARBLE_INCLUDE_DIR})
if( MARBLECONTROLBOX_H )
execute_process(COMMAND grep -m 1 -e "setMarbleWidget" ${MARBLECONTROLBOX_H}
OUTPUT_VARIABLE SETMARBLEWIDGET
)
INCLUDE(CheckCXXSourceCompiles)
set(CMAKE_REQUIRED_INCLUDES_SWAP ${CMAKE_REQUIRED_INCLUDES})
set(CMAKE_REQUIRED_LIBRARIES_SWAP ${CMAKE_REQUIRED_LIBRARIES})
set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${MARBLE_LIBRARIES})
CHECK_CXX_SOURCE_COMPILES ( "#include <${MARBLECONTROLBOX_H}>\nint main(){Marble::MarbleControlBox*p; p->setMarbleWidget(0); return 0;}" SETMARBLEWIDGET)
# subsequent tests will fail if this is not set back.
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SWAP})
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SWAP})
if( SETMARBLEWIDGET )
add_definitions(-DHAVE_SETMARBLEWIDGET)
endif( SETMARBLEWIDGET)
......@@ -490,11 +490,6 @@ if(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION)
set(SHOULD_BUILD_KRITA FALSE)
endif(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION)
### Plan: kdepimlibs
if(NOT KdepimLibs_FOUND)
set(SHOULD_BUILD_PLAN FALSE)
endif(NOT KdepimLibs_FOUND)
### Active needs tables, stage and words
if (NOT SHOULD_BUILD_TABLES OR NOT SHOULD_BUILD_STAGE OR NOT SHOULD_BUILD_WORDS)
set(SHOULD_BUILD_ACTIVE FALSE)
......@@ -510,6 +505,10 @@ if (NOT QT_QTDECLARATIVE_FOUND)
set(SHOULD_BUILD_ACTIVE FALSE)
endif (NOT QT_QTDECLARATIVE_FOUND)
if(${KDE_VERSION} VERSION_LESS 4.8.0)
set(SHOULD_BUILD_ACTIVE FALSE)
endif(${KDE_VERSION} VERSION_LESS 4.8.0)
#if(NOT QIMAGEBLITZ_FOUND)
# set (SHOULD_BUILD_KEXI FALSE)
#endif(NOT QIMAGEBLITZ_FOUND)
......
......@@ -21,9 +21,9 @@
#define KO_CHART_MODEL
#include <QtCore/QHash>
#include <QtCore/QVector>
#include <QtCore/QtPlugin>
#include <QHash>
#include <QVector>
#include <QtPlugin>
class QAbstractItemModel;
......
......@@ -23,9 +23,9 @@
#include <kdemacros.h>
#include <kdebug.h>
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtCore/QHash>
#include <QList>
#include <QString>
#include <QHash>
/**
* Base class for registry objects.
......
......@@ -22,9 +22,9 @@
#ifndef _KO_ID_H_
#define _KO_ID_H_
#include <QtCore/QString>
#include <QtCore/QMetaType>
#include <QtCore/QDebug>
#include <QString>
#include <QMetaType>
#include <QDebug>
#include <klocalizedstring.h>
......
......@@ -18,7 +18,7 @@
#include "koChart.h"
#include <qobject.h>
#include <QObject>
using namespace KoChart;
......
......@@ -19,10 +19,10 @@
#ifndef __koChart_h__
#define __koChart_h__
#include <QtCore/QVariant>
#include <QtCore/QVector>
#include <QtCore/QRect>
#include <QtCore/QtPlugin>
#include <QVariant>
#include <QVector>
#include <QRect>
#include <QtPlugin>
#include <KoDocument.h>
#include "kochart_export.h"
......
......@@ -22,7 +22,7 @@
#include <KoColor.h>
#include <kis_types.h>
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_BLUR_BENCHMARK_H
#define KIS_BLUR_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
#include <kis_types.h>
#include <KoColor.h>
......
......@@ -19,7 +19,7 @@
#ifndef KIS_DATAMANAGER_BENCHMARK_H
#define KIS_DATAMANAGER_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
class KisDatamanagerBenchmark : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef _KIS_FAST_MATH_BENCHMARK_H_
#define _KIS_FAST_MATH_BENCHMARK_H_
#include <QtTest/QtTest>
#include <QtTest>
class KisFastMathBenchmark : public QObject {
Q_OBJECT
......
......@@ -22,7 +22,7 @@
#include <KoColor.h>
#include <kis_types.h>
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -22,7 +22,7 @@
#include <KoColor.h>
#include <kis_types.h>
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_HLINEITERATOR_BENCHMARK_H
#define KIS_HLINEITERATOR_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_MASK_GENERATOR_BENCHMARK_H
#define KIS_MASK_GENERATOR_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
class KisMaskGeneratorBenchmark : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_PAINTER_BENCHMARK_H
#define KIS_PAINTER_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
#include <KoColor.h>