diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-09 00:34:04 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-09 00:34:04 (GMT) |
| commit | b8c8c87587bcc0312f0efbb2028885adb8419fee (patch) | |
| tree | 4857b4ff79acb48953c9a2a7c3a62c6dfeafdda3 /src/testlib/qtestelement.h | |
| parent | 9410eb0630e0f3b80ffd335002efbd7ce532e826 (diff) | |
| parent | 70283a0a87e46a8aa9d2e6296f4ed7c93cc230d6 (diff) | |
| download | Qt-b8c8c87587bcc0312f0efbb2028885adb8419fee.zip Qt-b8c8c87587bcc0312f0efbb2028885adb8419fee.tar.gz Qt-b8c8c87587bcc0312f0efbb2028885adb8419fee.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/tree.cpp
Diffstat (limited to 'src/testlib/qtestelement.h')
| -rw-r--r-- | src/testlib/qtestelement.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/testlib/qtestelement.h b/src/testlib/qtestelement.h index c1932da..e75689a 100644 --- a/src/testlib/qtestelement.h +++ b/src/testlib/qtestelement.h @@ -42,10 +42,14 @@ #ifndef QTESTELEMENT_H #define QTESTELEMENT_H -#include "qtestcoreelement.h" +#include <QtTest/qtestcoreelement.h> + +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Test) + class QTestElement: public QTestCoreElement<QTestElement> { public: @@ -66,4 +70,6 @@ class QTestElement: public QTestCoreElement<QTestElement> QT_END_NAMESPACE +QT_END_HEADER + #endif |