diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 13:15:38 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-12-18 13:15:38 +0000 |
| commit | d44cd5334a97f30a50295c385f855d751c187b9e (patch) | |
| tree | 45f29d64ba376138c1095b5c64d9c2481d92d801 /tests/auto/tools/qmake/testdata/findMocs/object3.h | |
| parent | 8b1eb5f4202fb4120a303cd2183bb96f212c5a32 (diff) | |
| parent | beb65dcd79f8c354dab7bb4a8d08157bd9d69329 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/tools/qmake/testdata/findMocs/object3.h')
| -rw-r--r-- | tests/auto/tools/qmake/testdata/findMocs/object3.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/qmake/testdata/findMocs/object3.h b/tests/auto/tools/qmake/testdata/findMocs/object3.h index c66edee6e1..c481a0796d 100644 --- a/tests/auto/tools/qmake/testdata/findMocs/object3.h +++ b/tests/auto/tools/qmake/testdata/findMocs/object3.h @@ -37,6 +37,6 @@ class Object3 : public QObject { - Q_OBJECT + Q_OBJ\ +ECT }; - |