[kdelibs/frameworks] experimental/kdeclarative: Revert f3d15aa83aa739, kdeclarative include paths

[Sebastian Kügler]

Git commit 802fef3c9ce56ccbd84f1adea1897ce4ae782ce0 by Sebastian Kügler.
Committed on 29/04/2013 at 14:38.
Pushed by sebas into branch 'frameworks'.

Revert f3d15aa83aa739, kdeclarative include paths

This patch is wrong, the correct solution was committed by Marco with
fd2cc8aa a little less than two hours before.

Benjamin, this was discussed on the frameworks-devel list, your patch
essentially reverts Marco's earlier patch, and breaks the
plasma-frameworks build, *right after* Marco has fixed it (renamed
libkdeclarative dir to kdeclarative, which also corrects the include
paths for clean builds).

Could you:
- Check if it now works for you as well?
- Check the mailinglist and existing discussion about this kind changes
  before committing, and if you push after rebasing, maybe quickly check
  if anything related happened in between? (This seems to be the case
  here, bad timing, but also a lack of communication.)

I've reverted it for now (and I hope you're OK with that), since I've
this change on my disk anyway.

CCMAIL:benjamin.port at ben2367.fr
CCMAIL:kde-frameworks-devel at kde.org

M  +1    -1    experimental/kdeclarative/configpropertymap.h
M  +1    -1    experimental/kdeclarative/kdeclarative.h
M  +1    -1    experimental/kdeclarative/qmlobject.h

http://commits.kde.org/kdelibs/802fef3c9ce56ccbd84f1adea1897ce4ae782ce0

diff --git a/experimental/kdeclarative/configpropertymap.h b/experimental/kdeclarative/configpropertymap.h
index 5aeda92..c9ef3ae 100644
--- a/experimental/kdeclarative/configpropertymap.h
+++ b/experimental/kdeclarative/configpropertymap.h
@@ -25,7 +25,7 @@
 
 #include <kconfigskeleton.h>
 
-#include <kdeclarative_export.h>
+#include <kdeclarative/kdeclarative_export.h>
 
 class KDECLARATIVE_EXPORT ConfigPropertyMap : public QQmlPropertyMap
 {
diff --git a/experimental/kdeclarative/kdeclarative.h b/experimental/kdeclarative/kdeclarative.h
index eac9be8..84e8df4 100644
--- a/experimental/kdeclarative/kdeclarative.h
+++ b/experimental/kdeclarative/kdeclarative.h
@@ -22,7 +22,7 @@
 
 #include <QtQml/QQmlEngine>
 
-#include <kdeclarative_export.h>
+#include <kdeclarative/kdeclarative_export.h>
 
 #include <QStringList>
 
diff --git a/experimental/kdeclarative/qmlobject.h b/experimental/kdeclarative/qmlobject.h
index 2f57784..e0fa268 100644
--- a/experimental/kdeclarative/qmlobject.h
+++ b/experimental/kdeclarative/qmlobject.h
@@ -28,7 +28,7 @@
 #include <QGuiApplication>
 #include <QScreen>
 
-#include <kdeclarative_export.h>
+#include <kdeclarative/kdeclarative_export.h>
 
 class QQmlEngine;
 class QQmlComponent;