diff options
| author | axis <qt-info@nokia.com> | 2009-05-20 13:44:05 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-20 13:44:05 +0200 |
| commit | 91e041fcff000024e619de5d7561ce141cb99d99 (patch) | |
| tree | 0fc7285a4a1634f6a74499c324d00b6aef181974 /tests/auto/qitemmodel | |
| parent | d68629e4cfb94776b8ef02cd01cf0b02bf430db8 (diff) | |
| parent | 25f86fbab2e7d23832b0bb8ae8530289258e2aa5 (diff) | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
Diffstat (limited to 'tests/auto/qitemmodel')
| -rw-r--r-- | tests/auto/qitemmodel/tst_qitemmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qitemmodel/tst_qitemmodel.cpp b/tests/auto/qitemmodel/tst_qitemmodel.cpp index ea1972e280..d29a3e3913 100644 --- a/tests/auto/qitemmodel/tst_qitemmodel.cpp +++ b/tests/auto/qitemmodel/tst_qitemmodel.cpp @@ -54,7 +54,7 @@ #include <QtTest/QtTest> #include <QtCore> #include <qdebug.h> -#include <modelstotest.cpp> +#include "modelstotest.cpp" #include <QMetaType> Q_DECLARE_METATYPE(QModelIndex) |