aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2019-04-17 16:30:27 +0200
committerAlessandro Portale <alessandro.portale@qt.io>2019-04-17 14:58:22 +0000
commitfa11c2f022ae660c0de0f275a2a26edcd6f523fd (patch)
treee73f41b663fd643741a2d899ef69598defca54e4
parent53c407bc0c87e0b65b537bf26836ddd8e00ead82 (diff)
JSON C++ Library wizard: Avoid some empty lines in output
Change-Id: I251299a2faf8580d199d6b0c0688904f59f13311 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--share/qtcreator/templates/wizards/projects/cpplibrary/lib.h2
-rw-r--r--share/qtcreator/templates/wizards/projects/cpplibrary/lib_global.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/lib.h b/share/qtcreator/templates/wizards/projects/cpplibrary/lib.h
index 80ef326ce5..4a5d1247a4 100644
--- a/share/qtcreator/templates/wizards/projects/cpplibrary/lib.h
+++ b/share/qtcreator/templates/wizards/projects/cpplibrary/lib.h
@@ -17,14 +17,12 @@
@if %{IsShared}
class %{LibraryExport} %{CN}
{
-
public:
%{CN}();
};
@elsif %{IsStatic}
class %{CN}
{
-
public:
%{CN}();
};
diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/lib_global.h b/share/qtcreator/templates/wizards/projects/cpplibrary/lib_global.h
index d6d65c377d..c665cf911c 100644
--- a/share/qtcreator/templates/wizards/projects/cpplibrary/lib_global.h
+++ b/share/qtcreator/templates/wizards/projects/cpplibrary/lib_global.h
@@ -23,7 +23,7 @@
#else
# define %{LibraryExport} Q_DECL_IMPORT
#endif
-
@if ! '%{Cpp:PragmaOnce}'
+
#endif // %{GLOBAL_GUARD}
@endif