Fix build on Windows.

40 files changed, 153 insertions, 75 deletions

diff --git a/itemviews-ng.pri b/itemviews-ng.pri
index 75981ba..a05d8bf 100644
--- a/itemviews-ng.pri
+++ b/itemviews-ng.pri
@@ -4,9 +4,7 @@ QMAKE_RPATHDIR = $$OUT_PWD/lib
 
 QMAKE_INCDIR += $$INCLUDEPATH
 QMAKE_LIBDIR += $$LIBRARYPATH
-
-win32:LIBS += -$$LIBRARYPATH/itemviews-ng.lib
-unix:LIBS += -litemviews-ng
+LIBS += -L../../lib -litemviews-ng
 
 win32:DEFINES += Q_ITEMVIEWSNG_EXPORT=__declspec(dllimport)
 unix:DEFINES += Q_ITEMVIEWSNG_EXPORT=""
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 e50b45a..792b806 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>
diff --git a/src/qgraphicsheader.h b/src/qgraphicsheader.h
index c93e20d..777f06e 100644
--- a/src/qgraphicsheader.h
+++ b/src/qgraphicsheader.h
@@ -24,6 +24,8 @@
 #ifndef QTGRAPHICSHEADER_H
 #define QTGRAPHICSHEADER_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtCore/qsize.h>
 #include <QtGui/qtransform.h>
 #include <QtGui/qgraphicswidget.h>
diff --git a/src/qgraphicslistview.h b/src/qgraphicslistview.h
index 4459226..108f78f 100644
--- a/src/qgraphicslistview.h
+++ b/src/qgraphicslistview.h
@@ -24,6 +24,8 @@
 #ifndef QTGRAPHICSLISTVIEW_H
 #define QTGRAPHICSLISTVIEW_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtGui/qgraphicswidget.h>
 
 QT_BEGIN_HEADER
@@ -85,23 +87,38 @@ public:
 };
 
 template <class T>
-class Q_ITEMVIEWSNG_EXPORT QtGraphicsListViewItemCreator : public QtGraphicsListViewItemCreatorBase
+class QtGraphicsListViewItemCreator : public QtGraphicsListViewItemCreatorBase
 {
 public:
-    inline QGraphicsObject *create(int index, QtGraphicsListView *view) { return new T(index, view); }
-    inline QGraphicsObject *reassign(int index, QGraphicsObject *item, QtGraphicsListView *view)
-    {
-        Q_UNUSED(view);
-        static_cast<T*>(item)->setIndex(index);
-        return item;
-    }
-    inline void update(int index, QGraphicsObject *item, const QList<int> &roles)
-    {
-        Q_UNUSED(index);
-        static_cast<T*>(item)->itemChanged(roles);
-    }
+    ~QtGraphicsListViewItemCreator();
+    QGraphicsObject *create(int index, QtGraphicsListView *view);
+    QGraphicsObject *reassign(int index, QGraphicsObject *item, QtGraphicsListView *view);
+    void update(int index, QGraphicsObject *item, const QList<int> &roles);
 };
 
+template <class T>
+QtGraphicsListViewItemCreator<T>::~QtGraphicsListViewItemCreator()
+{}
+
+template <class T>
+inline QGraphicsObject *QtGraphicsListViewItemCreator<T>::create(int index, QtGraphicsListView *view)
+{ return new T(index, view); }
+
+template <class T>
+inline QGraphicsObject *QtGraphicsListViewItemCreator<T>::reassign(int index, QGraphicsObject *item, QtGraphicsListView *view)
+{
+	Q_UNUSED(view);
+	static_cast<T*>(item)->setIndex(index);
+	return item;
+}
+
+template <class T>
+inline void QtGraphicsListViewItemCreator<T>::update(int index, QGraphicsObject *item, const QList<int> &roles)
+{
+	Q_UNUSED(index);
+	static_cast<T*>(item)->itemChanged(roles);
+}
+
 class Q_ITEMVIEWSNG_EXPORT QtGraphicsListView : public QGraphicsWidget
 {
     Q_OBJECT
diff --git a/src/qgraphicsscrollbar.h b/src/qgraphicsscrollbar.h
index dfbdcb0..0c8dad6 100644
--- a/src/qgraphicsscrollbar.h
+++ b/src/qgraphicsscrollbar.h
@@ -24,6 +24,8 @@
 #ifndef QTGRAPHICSSCROLLBAR_H
 #define QTGRAPHICSSCROLLBAR_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtGui/qgraphicswidget.h>
 
 QT_BEGIN_HEADER
diff --git a/src/qgraphicstableview.h b/src/qgraphicstableview.h
index 566c2e0..870da4e 100644
--- a/src/qgraphicstableview.h
+++ b/src/qgraphicstableview.h
@@ -24,6 +24,8 @@
 #ifndef QTGRAPHICSTABLEVIEW_H
 #define QTGRAPHICSTABLEVIEW_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtCore/qsize.h>
 #include <QtGui/qtransform.h>
 #include <QtGui/qgraphicswidget.h>
diff --git a/src/qgraphicstableview_p.h b/src/qgraphicstableview_p.h
index 3a7bc6d..55bbeed 100644
--- a/src/qgraphicstableview_p.h
+++ b/src/qgraphicstableview_p.h
@@ -39,7 +39,7 @@
 #include <qfont.h>
 #include <qvariant.h>
 
-#include <qtableselectionmanager.h>
+#include "qtableselectionmanager.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qgraphicstreeview.h b/src/qgraphicstreeview.h
index 5fbd719..650bf72 100644
--- a/src/qgraphicstreeview.h
+++ b/src/qgraphicstreeview.h
@@ -24,6 +24,8 @@
 #ifndef QTGRAPHICSTREEVIEW_H
 #define QTGRAPHICSTREEVIEW_H
 
+#include "qitemviewsglobal.h"
+
 #include "qtreemodelinterface.h"
 
 #include <QtCore/qsize.h>
@@ -51,7 +53,7 @@ class QRegion;
 class QPainter;
 class QWidget;
 
-class QtGraphicsTreeViewItem : public QGraphicsWidget
+class Q_ITEMVIEWSNG_EXPORT QtGraphicsTreeViewItem : public QGraphicsWidget
 {
 public:
     QtGraphicsTreeViewItem(const QtTreeModelIterator &it, QtGraphicsTreeView *view);
@@ -82,7 +84,7 @@ private:
     Q_DECLARE_PRIVATE(QtGraphicsTreeViewItem)
 };
 
-class QtGraphicsTreeViewItemCreatorBase
+class Q_ITEMVIEWSNG_EXPORT QtGraphicsTreeViewItemCreatorBase
 {
 public:
     virtual ~QtGraphicsTreeViewItemCreatorBase();
@@ -96,20 +98,34 @@ template <class T>
 class QtGraphicsTreeViewItemCreator : public QtGraphicsTreeViewItemCreatorBase
 {
 public:
-    inline QGraphicsObject *create(const QtTreeModelIterator &it, QtGraphicsTreeView *view) { return new T(it, view); }
-    inline QGraphicsObject *reassign(const QtTreeModelIterator &it, QGraphicsObject *item, QtGraphicsTreeView *view)
-    {
-        Q_UNUSED(view);
-        static_cast<QtGraphicsTreeViewItem*>(item)->setIterator(it);
-        return item;
-    }
-    inline void update(const QtTreeModelIterator &it, QGraphicsObject *item, const QList<int> &roles)
-    {
-        Q_UNUSED(it);
-        static_cast<QtGraphicsTreeViewItem*>(item)->itemChanged(roles);
-    }
+    ~QtGraphicsTreeViewItemCreator();
+    QGraphicsObject *create(const QtTreeModelIterator &it, QtGraphicsTreeView *view);
+    QGraphicsObject *reassign(const QtTreeModelIterator &it, QGraphicsObject *item, QtGraphicsTreeView *view);
+    void update(const QtTreeModelIterator &it, QGraphicsObject *item, const QList<int> &roles);
 };
 
+template <class T>
+QtGraphicsTreeViewItemCreator<T>::~QtGraphicsTreeViewItemCreator()
+{}
+
+template <class T>
+inline QGraphicsObject *QtGraphicsTreeViewItemCreator<T>::create(const QtTreeModelIterator &it, QtGraphicsTreeView *view)
+{ return new T(it, view); }
+
+template <class T>
+inline QGraphicsObject *QtGraphicsTreeViewItemCreator<T>::reassign(const QtTreeModelIterator &it, QGraphicsObject *item, QtGraphicsTreeView *view)
+{
+	Q_UNUSED(view);
+	static_cast<QtGraphicsTreeViewItem*>(item)->setIterator(it);
+	return item;
+}
+
+template <class T>
+inline void QtGraphicsTreeViewItemCreator<T>::update(const QtTreeModelIterator &it, QGraphicsObject *item, const QList<int> &roles)
+{
+	Q_UNUSED(it);
+	static_cast<QtGraphicsTreeViewItem*>(item)->itemChanged(roles);
+}
 
 class Q_ITEMVIEWSNG_EXPORT QtGraphicsTreeView : public QGraphicsWidget
 {
diff --git a/src/qitemviewsglobal.h b/src/qitemviewsglobal.h
new file mode 100644
index 0000000..770936c
--- /dev/null
+++ b/src/qitemviewsglobal.h
@@ -0,0 +1,23 @@
+#ifndef QITEMVIEWSNGGLOBAL_H
+#define QITEMVIEWSNGGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(Q_OS_WIN)
+#   if defined(QT_BUILD_ITEMVIEWS_LIB)
+#       ifndef Q_ITEMVIEWSNG_EXPORT
+#           define Q_ITEMVIEWSNG_EXPORT Q_DECL_EXPORT
+#       endif
+#   else
+#       ifndef Q_ITEMVIEWSNG_EXPORT
+#           define Q_ITEMVIEWSNG_EXPORT Q_DECL_IMPORT
+#       endif
+#   endif
+#else
+#       ifndef Q_ITEMVIEWSNG_EXPORT
+#           define Q_ITEMVIEWSNG_EXPORT
+#		endif
+#endif
+
+#endif //QITEMVIEWSNGGLOBAL_H
+
diff --git a/src/qlistcontroller.h b/src/qlistcontroller.h
index ad7f7c6..e729480 100644
--- a/src/qlistcontroller.h
+++ b/src/qlistcontroller.h
@@ -24,6 +24,8 @@
 #ifndef QTLISTCONTROLLER_H
 #define QTLISTCONTROLLER_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
diff --git a/src/qlistdefaultmodel.cpp b/src/qlistdefaultmodel.cpp
index 73e18e5..1fff894 100644
--- a/src/qlistdefaultmodel.cpp
+++ b/src/qlistdefaultmodel.cpp
@@ -25,8 +25,9 @@
 
 QT_BEGIN_NAMESPACE
 
-struct QtListDefaultItemPrivate
+class QtListDefaultItemPrivate
 {
+public:
     inline QtListDefaultItemPrivate() : model(0), index(-1) {}
     QHash<int,QVariant> data;
     QtListDefaultModel *model;
diff --git a/src/qlistmodelinterface.cpp b/src/qlistmodelinterface.cpp
index 768d87e..05923d1 100644
--- a/src/qlistmodelinterface.cpp
+++ b/src/qlistmodelinterface.cpp
@@ -130,4 +130,6 @@ QHash<int,QByteArray> QtListModelInterface::roles() const
     items were changed in the model beginning with \a index.
 */
 
+#include "moc_qlistmodelinterface.cpp"
+
 QT_END_NAMESPACE
diff --git a/src/qlistmodelinterface.h b/src/qlistmodelinterface.h
index f3e3897..bbe643b 100644
--- a/src/qlistmodelinterface.h
+++ b/src/qlistmodelinterface.h
@@ -24,6 +24,8 @@
 #ifndef QTLISTMODELINTERFACE_H
 #define QTLISTMODELINTERFACE_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtCore/qhash.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qobject.h>
diff --git a/src/qlistselectionmanager.cpp b/src/qlistselectionmanager.cpp
index 43d68a9..776d83e 100644
--- a/src/qlistselectionmanager.cpp
+++ b/src/qlistselectionmanager.cpp
@@ -145,6 +145,12 @@ QtListSelectionChange::~QtListSelectionChange()
 {
 }
 
+QtListSelectionChange &QtListSelectionChange::operator=(const QtListSelectionChange &other)
+{
+    d = other.d;
+    return *this;
+}
+
 int QtListSelectionChange::index() const
 {
     return d->from();
diff --git a/src/qlistselectionmanager.h b/src/qlistselectionmanager.h
index 7763d4f..7c68971 100644
--- a/src/qlistselectionmanager.h
+++ b/src/qlistselectionmanager.h
@@ -24,6 +24,8 @@
 #ifndef QTLISTSELECTIONMANAGER_H
 #define QTLISTSELECTIONMANAGER_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtCore/qobject.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qshareddata.h>
@@ -45,6 +47,7 @@ public:
     QtListSelectionChange();
     QtListSelectionChange(const QtListSelectionChange &other);
     ~QtListSelectionChange();
+	QtListSelectionChange &operator=(const QtListSelectionChange &other);
     int index() const;
     int count() const;
     QList<int> indexes() const;
diff --git a/src/qlistwidgetng.h b/src/qlistwidgetng.h
index 5e491cf..04a965d 100644
--- a/src/qlistwidgetng.h
+++ b/src/qlistwidgetng.h
@@ -24,6 +24,8 @@
 #ifndef QTLISTWIDGETNG_H
 #define QTLISTWIDGETNG_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtGui/qgraphicsview.h>
 
 QT_BEGIN_HEADER
diff --git a/src/qtablecontroller.h b/src/qtablecontroller.h
index 15bc320..0878370 100644
--- a/src/qtablecontroller.h
+++ b/src/qtablecontroller.h
@@ -24,6 +24,8 @@
 #ifndef QTTABLECONTROLLER_H
 #define QTTABLECONTROLLER_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtCore/qobject.h>
 #include <QtGui/qtransform.h>
 
diff --git a/src/qtabledefaultmodel.cpp b/src/qtabledefaultmodel.cpp
index 0361671..6c93c34 100644
--- a/src/qtabledefaultmodel.cpp
+++ b/src/qtabledefaultmodel.cpp
@@ -25,8 +25,9 @@
 
 QT_BEGIN_NAMESPACE
 
-struct QtTableDefaultItemPrivate
+class QtTableDefaultItemPrivate
 {
+public:
     inline QtTableDefaultItemPrivate() : model(0), index(-1) {}
     QHash<int,QVariant> data;
     QtTableDefaultModel *model;
diff --git a/src/qtablemodelinterface.h b/src/qtablemodelinterface.h
index 780c1ae..379d518 100644
--- a/src/qtablemodelinterface.h
+++ b/src/qtablemodelinterface.h
@@ -24,6 +24,8 @@
 #ifndef QTTABLEMODELINTERFACE_H
 #define QTTABLEMODELINTERFACE_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtCore/qhash.h>
 #include <QtCore/qvariant.h>
 
diff --git a/src/qtableselectionmanager.h b/src/qtableselectionmanager.h
index ce0b9b8..5f94a1b 100644
--- a/src/qtableselectionmanager.h
+++ b/src/qtableselectionmanager.h
@@ -24,6 +24,8 @@
 #ifndef QTTABLESELECTIONMANAGER_H
 #define QTTABLESELECTIONMANAGER_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtCore/qobject.h>
 #include <QtCore/qpair.h>
 
diff --git a/src/qtablewidgetng.h b/src/qtablewidgetng.h
index b144f06..73eccd1 100644
--- a/src/qtablewidgetng.h
+++ b/src/qtablewidgetng.h
@@ -24,6 +24,8 @@
 #ifndef QTTABLEWIDGETNG_H
 #define QTTABLEWIDGETNG_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtGui/qgraphicsview.h>
 
 QT_BEGIN_HEADER
diff --git a/src/qtreecontroller_p.h b/src/qtreecontroller_p.h
index 95230b3..d38a330 100644
--- a/src/qtreecontroller_p.h
+++ b/src/qtreecontroller_p.h
@@ -35,7 +35,7 @@
 // We mean it.
 //
 
-#include <qtreeselectionmanager.h>
+#include "qtreeselectionmanager.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qtreemodelbase.h b/src/qtreemodelbase.h
index c821444..61f41f7 100644
--- a/src/qtreemodelbase.h
+++ b/src/qtreemodelbase.h
@@ -24,6 +24,8 @@
 #ifndef QTTREEMODELBASE_H
 #define QTTREEMODELBASE_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtCore/qhash.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
diff --git a/src/src.pro b/src/src.pro
index c33a608..d0139f8 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,7 +1,9 @@
 TEMPLATE = lib
 TARGET = itemviews-ng
 DESTDIR = $$OUT_PWD/../lib
-HEADERS += qgraphicsscrollbar.h \
+DEFINES += QT_BUILD_ITEMVIEWS_LIB
+HEADERS += qitemviewsglobal.h \
+	qgraphicsscrollbar.h \
     qgraphicsscrollbar_p.h \
     qgraphicsheader.h \
     qgraphicsheader_p.h \
@@ -87,10 +89,3 @@ SOURCES += qgraphicsscrollbar.cpp \
     experimental/qkineticlistcontroller.cpp \
     # experimental/qprinterlistview.cpp \
     # experimental/qprintertableview.cpp \
-
-win32 {
-    DEFINES += Q_ITEMVIEWSNG_EXPORT=__declspec(dllexport)
-} else {
-    DEFINES += Q_ITEMVIEWSNG_EXPORT=
-}
-
diff --git a/tests/qgraphicsflowview/tst_qgraphicsflowview.cpp b/tests/qgraphicsflowview/tst_qgraphicsflowview.cpp
index 9bb3124..a52fd68 100644
--- a/tests/qgraphicsflowview/tst_qgraphicsflowview.cpp
+++ b/tests/qgraphicsflowview/tst_qgraphicsflowview.cpp
@@ -232,4 +232,4 @@ void tst_QListFlowLayout::layoutPositioningVertical() // vertical
 }
 
 QTEST_MAIN(tst_QListFlowLayout)
-#include <tst_qgraphicsflowview.moc>
+#include "tst_qgraphicsflowview.moc"
diff --git a/tests/qgraphicslistview/tst_qgraphicslistview.cpp b/tests/qgraphicslistview/tst_qgraphicslistview.cpp
index e8c25e6..0293413 100644
--- a/tests/qgraphicslistview/tst_qgraphicslistview.cpp
+++ b/tests/qgraphicslistview/tst_qgraphicslistview.cpp
@@ -827,4 +827,4 @@ void tst_QtGraphicsListView::layout()
 }
 
 QTEST_MAIN(tst_QtGraphicsListView)
-#include <tst_qgraphicslistview.moc>
+#include "tst_qgraphicslistview.moc"
diff --git a/tests/qgraphicstreeview/tst_qgraphicstreeview.cpp b/tests/qgraphicstreeview/tst_qgraphicstreeview.cpp
index b1f2281..ccaa3c5 100644
--- a/tests/qgraphicstreeview/tst_qgraphicstreeview.cpp
+++ b/tests/qgraphicstreeview/tst_qgraphicstreeview.cpp
@@ -265,4 +265,4 @@ void tst_QtGraphicsTreeView::layout()
 }
 
 QTEST_MAIN(tst_QtGraphicsTreeView)
-#include <tst_qgraphicstreeview.moc>
+#include "tst_qgraphicstreeview.moc"
diff --git a/tests/qlistdefaultmodel/tst_qlistdefaultmodel.cpp b/tests/qlistdefaultmodel/tst_qlistdefaultmodel.cpp
index ede665e..e910a06 100644
--- a/tests/qlistdefaultmodel/tst_qlistdefaultmodel.cpp
+++ b/tests/qlistdefaultmodel/tst_qlistdefaultmodel.cpp
@@ -475,4 +475,4 @@ void tst_QtListDefaultModel::setData()
 }
 
 QTEST_MAIN(tst_QtListDefaultModel)
-#include <tst_qlistdefaultmodel.moc>
+#include "tst_qlistdefaultmodel.moc"
diff --git a/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp b/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp
index 5d491d0..d148d5a 100644
--- a/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp
+++ b/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp
@@ -201,5 +201,5 @@ void tst_QtListModelAdaptor::setData()
 
 QTEST_MAIN(tst_QtListModelAdaptor)
 
-#include <tst_qlistmodeladaptor.moc>
+#include "tst_qlistmodeladaptor.moc"
 
diff --git a/tests/tests.pri b/tests/tests.pri
index 34672d9..c98741a 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -16,9 +16,3 @@ embedded:  test.commands += -qws
 INSTALLS += test
 
 QMAKE_EXTRA_TARGETS += test
-
-win32 {
-    DEFINES += Q_ITEMVIEWSNG_EXPORT=__declspec(dllimport)
-} else {
-    DEFINES += Q_ITEMVIEWSNG_EXPORT=
-}