diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-22 04:41:04 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-22 04:41:04 (GMT) |
commit | ba9caa7181282109ea8def0994838b6538da0b13 (patch) | |
tree | f1ae3f595fe6f601ce411d69179d6c0c8c650386 /tests/auto/qitemview/tst_qitemview.cpp | |
parent | 2575eac4c26ad92dde95959a82f576edc3e76e1d (diff) | |
parent | f9d26f0bebd5bcc32d15c4a627251c44cf78389e (diff) | |
download | Qt-ba9caa7181282109ea8def0994838b6538da0b13.zip Qt-ba9caa7181282109ea8def0994838b6538da0b13.tar.gz Qt-ba9caa7181282109ea8def0994838b6538da0b13.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/tools/tools.pri
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
Diffstat (limited to 'tests/auto/qitemview/tst_qitemview.cpp')
-rw-r--r-- | tests/auto/qitemview/tst_qitemview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/qitemview/tst_qitemview.cpp index 748bd50..3317c1d 100644 --- a/tests/auto/qitemview/tst_qitemview.cpp +++ b/tests/auto/qitemview/tst_qitemview.cpp @@ -42,7 +42,7 @@ #include <QtTest/QtTest> #include <QtCore/QtCore> -#include <viewstotest.cpp> +#include "viewstotest.cpp" #include <stdlib.h> #if defined(Q_OS_WIN) |