Commit 16e71d41 authored by Halla Rempt's avatar Halla Rempt

Move krita/ui to libs/ui

This exposed a bunch more places where our promiscuous include_directories
led to a mess...
parent ba78c845

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
project(krita) project(krita)
set(KRITA_INCLUDES set(KRITA_INCLUDES
# For config-*.h
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/image
${CMAKE_SOURCE_DIR}/krita/image
${CMAKE_SOURCE_DIR}/krita/image/brushengine
${CMAKE_SOURCE_DIR}/krita/image/tiles
${CMAKE_SOURCE_DIR}/krita/ui
${CMAKE_SOURCE_DIR}/krita/ui/canvas
${CMAKE_SOURCE_DIR}/krita/ui/tool
${CMAKE_SOURCE_DIR}/krita/ui/flake
${CMAKE_SOURCE_DIR}/krita/ui/widgets
# For generated files from .ui
${CMAKE_BINARY_DIR}/krita/ui
${PIGMENT_INCLUDES} ${PIGMENT_INCLUDES}
${BASICFLAKES_INCLUDES} ${BASICFLAKES_INCLUDES}
${TEXTLAYOUT_INCLUDES} ${TEXTLAYOUT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/ui
${CMAKE_SOURCE_DIR}/libs/ui/canvas
${CMAKE_SOURCE_DIR}/libs/ui/widgets
${CMAKE_SOURCE_DIR}/libs/ui/tool
${CMAKE_SOURCE_DIR}/libs/ui/flake
${CMAKE_SOURCE_DIR}/libs/ui/ora
${CMAKE_SOURCE_DIR}/libs/widgets ${CMAKE_SOURCE_DIR}/libs/widgets
${CMAKE_SOURCE_DIR}/libs/widgets/resources ${CMAKE_SOURCE_DIR}/libs/widgets/resources
${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
...@@ -34,7 +24,6 @@ set(KRITA_INCLUDES ...@@ -34,7 +24,6 @@ set(KRITA_INCLUDES
include_directories(${KRITA_INCLUDES}) include_directories(${KRITA_INCLUDES})
add_subdirectory( ui )
add_subdirectory( dtd ) add_subdirectory( dtd )
add_subdirectory( plugins ) add_subdirectory( plugins )
add_subdirectory( data ) add_subdirectory( data )
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "data/splash/splash_screen.xpm" #include "data/splash/splash_screen.xpm"
#include "data/splash/splash_holidays.xpm" #include "data/splash/splash_holidays.xpm"
#include "ui/KisDocument.h" #include "KisDocument.h"
#include "kis_splash_screen.h" #include "kis_splash_screen.h"
#include "KisPart.h" #include "KisPart.h"
#include "KisApplicationArguments.h" #include "KisApplicationArguments.h"
......
...@@ -23,8 +23,9 @@ ...@@ -23,8 +23,9 @@
#include <QPainter> #include <QPainter>
#include <QLinearGradient> #include <QLinearGradient>
#include <QTransform> #include <QTransform>
#include <kis_canvas2.h>
#include "kis_coordinates_converter.h" #include <kis_coordinates_converter.h>
#include <kis_algebra_2d.h>
#include <math.h> #include <math.h>
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include <QLinearGradient> #include <QLinearGradient>
#include <QTransform> #include <QTransform>
#include "kis_coordinates_converter.h" #include <kis_canvas2.h>
#include <kis_coordinates_converter.h>
#include <math.h> #include <math.h>
......
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
#include <QLinearGradient> #include <QLinearGradient>
#include <QTransform> #include <QTransform>
#include "kis_coordinates_converter.h" #include <kis_canvas2.h>
#include "kis_algebra_2d.h" #include <kis_coordinates_converter.h>
#include <kis_algebra_2d.h>
#include <math.h> #include <math.h>
#include <limits> #include <limits>
......
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
#include <QLinearGradient> #include <QLinearGradient>
#include <QTransform> #include <QTransform>
#include "kis_coordinates_converter.h" #include <kis_canvas2.h>
#include "kis_algebra_2d.h" #include <kis_coordinates_converter.h>
#include <kis_algebra_2d.h>
#include <math.h> #include <math.h>
......
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
#include <QLinearGradient> #include <QLinearGradient>
#include <QTransform> #include <QTransform>
#include "kis_coordinates_converter.h" #include <kis_canvas2.h>
#include "kis_algebra_2d.h" #include <kis_coordinates_converter.h>
#include <kis_algebra_2d.h>
#include <math.h> #include <math.h>
......
...@@ -25,8 +25,9 @@ ...@@ -25,8 +25,9 @@
#include <QLinearGradient> #include <QLinearGradient>
#include <QTransform> #include <QTransform>
#include "kis_coordinates_converter.h" #include <kis_canvas2.h>
#include "kis_algebra_2d.h" #include <kis_coordinates_converter.h>
#include <kis_algebra_2d.h>
#include <math.h> #include <math.h>
#include <limits> #include <limits>
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include <QLinearGradient> #include <QLinearGradient>
#include <QTransform> #include <QTransform>