diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-02 06:05:00 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-02 06:05:00 (GMT) |
| commit | 34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd (patch) | |
| tree | a7e0c9a55afb413443c55733622e813e17eaea95 /tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp | |
| parent | 685c0b930a1d1ecfdcc78aa688a333564cc9ca5b (diff) | |
| parent | fd7d730d04862095898773a781bb9a254d0aeb00 (diff) | |
| download | Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.zip Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.tar.gz Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.tar.bz2 | |
Merge branch 'master' into 4.7
Conflicts:
tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp index 5d57bb4..7ade309 100644 --- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp +++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp @@ -40,15 +40,6 @@ ****************************************************************************/ #include <QtTest/QtTest> -<<<<<<< HEAD -#include <private/qlistmodelinterface_p.h> -#include <qdeclarativeview.h> -#include <private/qdeclarativegridview_p.h> -#include <private/qdeclarativetext_p.h> -#include <private/qdeclarativerectangle_p.h> -#include <qdeclarativecontext.h> -#include <qdeclarativeexpression.h> -======= #include <QtGui/qstringlistmodel.h> #include <QtDeclarative/qdeclarativeview.h> #include <QtDeclarative/qdeclarativeengine.h> @@ -59,7 +50,6 @@ #include <QtDeclarative/private/qdeclarativegridview_p.h> #include <QtDeclarative/private/qdeclarativetext_p.h> #include <QtDeclarative/private/qdeclarativelistmodel_p.h> ->>>>>>> Add NOTIFY signals to list, grid and path views class tst_QDeclarativeGridView : public QObject { |