Merge branch 'master' of git@scm.dev.nokia.troll.no:research/itemviews-ng

Conflicts:
	src/qgraphicslistview.h

11 files changed, 22 insertions, 22 deletions

diff --git a/src/experimental/qgraphicsflowview.cpp b/src/experimental/qgraphicsflowview.cpp
index a5f9624..1dfb35d 100644
--- a/src/experimental/qgraphicsflowview.cpp
+++ b/src/experimental/qgraphicsflowview.cpp
@@ -21,9 +21,9 @@
 **
 ****************************************************************************/
 #include "qgraphicsflowview.h"
-#include "qgraphicslistview_p.h"
-#include "qlistmodelinterface.h"
-#include "qlistselectionmanager.h"
+#include "../qgraphicslistview_p.h"
+#include "../qlistmodelinterface.h"
+#include "../qlistselectionmanager.h"
 
 #include <qstyleoption.h>
 #include <qmath.h>
diff --git a/src/experimental/qgraphicsflowview.h b/src/experimental/qgraphicsflowview.h
index 5ba64e0..f38493a 100644
--- a/src/experimental/qgraphicsflowview.h
+++ b/src/experimental/qgraphicsflowview.h
@@ -23,7 +23,7 @@
 #ifndef QTGRAPHICSFLOWVIEW_H
 #define QTGRAPHICSFLOWVIEW_H
 
-#include "qgraphicslistview.h"
+#include "../qgraphicslistview.h"
 
 class QtGraphicsFlowViewPrivate;
 
diff --git a/src/experimental/qgraphicsgridview.cpp b/src/experimental/qgraphicsgridview.cpp
index 3297e35..86822f5 100644
--- a/src/experimental/qgraphicsgridview.cpp
+++ b/src/experimental/qgraphicsgridview.cpp
@@ -23,9 +23,9 @@
 
 #include "qgraphicsgridview.h"
 
-#include "qgraphicslistview_p.h"
-#include "qlistselectionmanager.h"
-#include "qlistmodelinterface.h"
+#include "../qgraphicslistview_p.h"
+#include "../qlistselectionmanager.h"
+#include "../qlistmodelinterface.h"
 
 #include <qdebug.h>
 #include <qpainter.h>
diff --git a/src/experimental/qgraphicsgridview.h b/src/experimental/qgraphicsgridview.h
index a00dd0c..8a56344 100644
--- a/src/experimental/qgraphicsgridview.h
+++ b/src/experimental/qgraphicsgridview.h
@@ -24,7 +24,7 @@
 #ifndef QTGRAPHICSGRIDVIEW_H
 #define QTGRAPHICSGRIDVIEW_H
 
-#include "qgraphicslistview.h"
+#include "../qgraphicslistview.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/experimental/qgraphicspathview.cpp b/src/experimental/qgraphicspathview.cpp
index a20f8d5..40f995f 100644
--- a/src/experimental/qgraphicspathview.cpp
+++ b/src/experimental/qgraphicspathview.cpp
@@ -22,10 +22,10 @@
 ****************************************************************************/
 
 #include "qgraphicspathview.h"
-#include "qgraphicslistview_p.h"
+#include "../qgraphicslistview_p.h"
 
-#include "qlistselectionmanager.h"
-#include "qlistmodelinterface.h"
+#include "../qlistselectionmanager.h"
+#include "../qlistmodelinterface.h"
 
 #include <qdebug.h>
 #include <qpainter.h>
diff --git a/src/experimental/qgraphicspathview.h b/src/experimental/qgraphicspathview.h
index 7b49d0c..5fd1d1e 100644
--- a/src/experimental/qgraphicspathview.h
+++ b/src/experimental/qgraphicspathview.h
@@ -24,7 +24,7 @@
 #ifndef QTGRAPHICSPATHVIEW_H
 #define QTGRAPHICSPATHVIEW_H
 
-#include "qgraphicslistview.h"
+#include "../qgraphicslistview.h"
 #include <QtGui/qpainterpath.h>
 
 QT_BEGIN_HEADER
diff --git a/src/experimental/qkineticlistcontroller.h b/src/experimental/qkineticlistcontroller.h
index 2de7339..bf050c4 100644
--- a/src/experimental/qkineticlistcontroller.h
+++ b/src/experimental/qkineticlistcontroller.h
@@ -24,7 +24,7 @@
 #ifndef QTKINETICLISTCONTROLLER_H
 #define QTKINETICLISTCONTROLLER_H
 
-#include <qlistcontroller.h>
+#include "../qlistcontroller.h"
 #include <QtCore/qmetatype.h>
 
 QT_BEGIN_HEADER
diff --git a/src/experimental/qkineticlistcontroller_p.h b/src/experimental/qkineticlistcontroller_p.h
index 30c773b..72126b3 100644
--- a/src/experimental/qkineticlistcontroller_p.h
+++ b/src/experimental/qkineticlistcontroller_p.h
@@ -35,8 +35,8 @@
 // We mean it.
 //
 
-#include "qlistcontroller_p.h"
-#include "qgraphicslistview.h"
+#include "../qlistcontroller_p.h"
+#include "../qgraphicslistview.h"
 
 #include <qpoint.h>
 
diff --git a/src/experimental/qlistiteminterface.cpp b/src/experimental/qlistiteminterface.cpp
index 3d7f888..7db2c69 100644
--- a/src/experimental/qlistiteminterface.cpp
+++ b/src/experimental/qlistiteminterface.cpp
@@ -22,7 +22,7 @@
 ****************************************************************************/
 
 #include "qlistiteminterface.h"
-#include "qlistmodelinterface.h"
+#include "../qlistmodelinterface.h"
 
 class QtListItemInterfacePrivate
 {
diff --git a/src/experimental/qprinterlistview.cpp b/src/experimental/qprinterlistview.cpp
index 689d9fb..6323c1a 100644
--- a/src/experimental/qprinterlistview.cpp
+++ b/src/experimental/qprinterlistview.cpp
@@ -26,9 +26,9 @@
 
 #ifndef QT_NO_PRINTER
 
-#include "qlistcontroller.h"
-#include "qlistmodelinterface.h"
-#include "qgraphicslistview.h"
+#include "../qlistcontroller.h"
+#include "../qlistmodelinterface.h"
+#include "../qgraphicslistview.h"
 
 #include <qstyleoption.h>
 #include <qpainter.h>
diff --git a/src/experimental/qprintertableview.cpp b/src/experimental/qprintertableview.cpp
index aa3fefb..88f4e79 100644
--- a/src/experimental/qprintertableview.cpp
+++ b/src/experimental/qprintertableview.cpp
@@ -26,9 +26,9 @@
 
 #ifndef QT_NO_PRINTER
 
-#include "qgraphicstableview.h"
-#include "qtablemodelinterface.h"
-#include "qgraphicsheader.h"
+#include "../qgraphicstableview.h"
+#include "../qtablemodelinterface.h"
+#include "../qgraphicsheader.h"
 
 #include <qgraphicsscene.h>
 #include <qpainter.h>