[gegl-qt] Fix convenience headers

[Jon Nordby <jonnor src gnome org>]

commit 0d89a8b6d86cbb206927dcc25fad05ba379db73e
Author: Jon Nordby <jononor gmail com>
Date:   Thu Sep 22 21:53:08 2011 +0200

    Fix convenience headers
    
    GeglQt had guards that broke it and was not installed.
    Add GeglQtDeclarative, for consistency.

 gegl-qt/GeglQt            |   10 +---------
 gegl-qt/GeglQtDeclarative |    1 +
 gegl-qt/gegl-qt.pro       |    4 ++--
 pygegl-qt/global.h        |    1 +
 pygegl-qt/pygegl-qt.pro   |    2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/gegl-qt/GeglQt b/gegl-qt/GeglQt
index 026fba6..3727c41 100644
--- a/gegl-qt/GeglQt
+++ b/gegl-qt/GeglQt
@@ -1,9 +1 @@
-#ifndef GEGLQT_H
-#define GEGLQT_H
-
-// #include <gegl-qt.h>
-#include <nodeviewdeclarativeitem.h>
-#include <nodeviewwidget.h>
-#include <nodeviewgraphicswidget.h>
-
-#endif // GEGLQT_H
+#include <gegl-qt.h>
diff --git a/gegl-qt/GeglQtDeclarative b/gegl-qt/GeglQtDeclarative
new file mode 100644
index 0000000..be3940c
--- /dev/null
+++ b/gegl-qt/GeglQtDeclarative
@@ -0,0 +1 @@
+#include <gegl-qt-declarative.h>
diff --git a/gegl-qt/gegl-qt.pro b/gegl-qt/gegl-qt.pro
index e95ad57..4e2204d 100644
--- a/gegl-qt/gegl-qt.pro
+++ b/gegl-qt/gegl-qt.pro
@@ -23,7 +23,7 @@ PUBLIC_SOURCES += \
     nodeviewgraphicswidget.cpp \
     nodeviewoptions.cpp \
 
-TOP_HEADERS += gegl-qt.h
+TOP_HEADERS += gegl-qt.h GeglQt
 
 PUBLIC_HEADERS = \
     nodeviewwidget.h \
@@ -34,7 +34,7 @@ PUBLIC_HEADERS = \
 contains(HAVE_QT_DECLARATIVE, yes) {
     PUBLIC_HEADERS += nodeviewdeclarativeitem.h
     PUBLIC_SOURCES += nodeviewdeclarativeitem.cpp
-    TOP_HEADERS += gegl-qt-declarative.h
+    TOP_HEADERS += gegl-qt-declarative.h GeglQtDeclarative
 }
 
 PRIVATE_HEADERS = \
diff --git a/pygegl-qt/global.h b/pygegl-qt/global.h
index bee815e..192a5d2 100644
--- a/pygegl-qt/global.h
+++ b/pygegl-qt/global.h
@@ -7,4 +7,5 @@
 
 #include "pyside_global.h"
 #include <GeglQt>
+#include <GeglQtDeclarative>
 
diff --git a/pygegl-qt/pygegl-qt.pro b/pygegl-qt/pygegl-qt.pro
index 0b6c876..1af8b16 100644
--- a/pygegl-qt/pygegl-qt.pro
+++ b/pygegl-qt/pygegl-qt.pro
@@ -10,7 +10,7 @@ TYPESYSTEM_DIR = $$system(pkg-config pyside --variable=typesystemdir)
 LIBGEGLQT_SRC_DIR = ../gegl-qt
 PYSIDE_INCLUDE_DIR = $$system(pkg-config --variable=includedir pyside)
 HEADERDIR_QT = $$[QT_INSTALL_HEADERS]
-GEN_INCLUDE_PATHS = $$LIBGEGLQT_SRC_DIR:$$HEADERDIR_QT/QtCore:$$HEADERDIR_QT
+GEN_INCLUDE_PATHS = ..:$$LIBGEGLQT_SRC_DIR:$$HEADERDIR_QT/QtCore:$$HEADERDIR_QT
 
 INCLUDES += \
     -I.. \