diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2014-10-31 14:02:20 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2014-11-03 09:44:08 +0100 |
commit | cda0320f5befd290082e26e0a815a57651cab168 (patch) | |
tree | 3b1aad0df293a9c51626b4c75e63fb4e3935321e /share | |
parent | e42eb66f1f0c43b18a68858b3dcf37a8e9f78a5c (diff) | |
download | qt-creator-cda0320f5befd290082e26e0a815a57651cab168.tar.gz |
JsonWizard: Match up files generated by the Cpp Class wizard
Change-Id: I407958b02446e81a449a34519a9eb592723a08a5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'share')
-rw-r--r-- | share/qtcreator/templates/wizards/classes/cpp/file.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/templates/wizards/classes/cpp/file.h b/share/qtcreator/templates/wizards/classes/cpp/file.h index 74f21d7c37..261d91a299 100644 --- a/share/qtcreator/templates/wizards/classes/cpp/file.h +++ b/share/qtcreator/templates/wizards/classes/cpp/file.h @@ -28,13 +28,13 @@ class %{CN} { @if '%{isQObject}' Q_OBJECT +@endif public: +@if '%{Base}' === 'QObject' explicit %{CN}(QObject *parent = 0); @elsif '%{Base}' === 'QWidget' || '%{Base}' === 'QMainWindow' -public explicit %{CN}(QWidget *parent = 0); @else -public: %{CN}(); @endif @if '%{IncludeQSharedData}' |