Use newlines more consistently in generate compile-test code

The generated code contained many repeated blank lines.
Most main()s were preceded by one, but not all.
Only include blank lines for actual empty entries in lists, where
configure.json specified them, plus one before main if anything else
precedes it.

Change-Id: I6e6c34940e08712a1aa848a3c9ad1b0fb5806d77
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

2 files changed, 28 insertions, 48 deletions

diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake
index a9d8ec4cb7..5665bea9db 100644
--- a/src/gui/.prev_configure.cmake
+++ b/src/gui/.prev_configure.cmake
@@ -144,6 +144,7 @@ extern \"C\" {
 #include <xf86drmMode.h>
 #include <xf86drm.h>
 }
+
 int main(void)
 {
     /* BEGIN TEST: */
@@ -188,8 +189,7 @@ qt_config_compile_test(egl_brcm
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 #include <bcm_host.h>
 
 int main(void)
@@ -208,8 +208,7 @@ qt_config_compile_test(egl_egldevice
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 int main(void)
@@ -230,8 +229,7 @@ qt_config_compile_test(egl_mali
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <EGL/fbdev_window.h>
+"#include <EGL/fbdev_window.h>
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
 
@@ -250,8 +248,7 @@ qt_config_compile_test(egl_mali_2
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 #include <GLES2/gl2.h>
 
 int main(void)
@@ -269,8 +266,7 @@ qt_config_compile_test(egl_viv
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 #include <EGL/eglvivante.h>
 
 int main(void)
@@ -295,8 +291,7 @@ qt_config_compile_test(egl_openwfd
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <wfd.h>
+"#include <wfd.h>
 
 int main(void)
 {
@@ -314,11 +309,11 @@ qt_config_compile_test(egl_rcar
         EGL::EGL
         GLESv2::GLESv2
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 extern \"C\" {
 extern unsigned long PVRGrfxServerInit(void);
 }
+
 int main(void)
 {
     /* BEGIN TEST: */
@@ -345,7 +340,6 @@ enum {
     e4 = SYN_REPORT,
 };
 
-
 int main(void)
 {
     /* BEGIN TEST: */
@@ -360,8 +354,7 @@ input_event buf[32];
 qt_config_compile_test(integrityfb
     LABEL "INTEGRITY framebuffer"
     CODE
-"
-#include <device/fbdriver.h>
+"#include <device/fbdriver.h>
 
 int main(void)
 {
@@ -376,8 +369,7 @@ FBDriver *driver = 0;
 qt_config_compile_test(linuxfb
     LABEL "LinuxFB"
     CODE
-"
-#include <linux/fb.h>
+"#include <linux/fb.h>
 #include <sys/kd.h>
 #include <sys/ioctl.h>
 
@@ -407,7 +399,6 @@ qt_config_compile_test(opengles3
 #  include <GLES3/gl3.h>
 #endif
 
-
 int main(void)
 {
     /* BEGIN TEST: */
@@ -427,8 +418,7 @@ qt_config_compile_test(opengles31
     LIBRARIES
         GLESv2::GLESv2
     CODE
-"
-#include <GLES3/gl31.h>
+"#include <GLES3/gl31.h>
 
 int main(void)
 {
@@ -446,8 +436,7 @@ qt_config_compile_test(opengles32
     LIBRARIES
         GLESv2::GLESv2
     CODE
-"
-#include <GLES3/gl32.h>
+"#include <GLES3/gl32.h>
 
 int main(void)
 {
@@ -490,6 +479,7 @@ qt_config_compile_test(xcb_syslibs
 #include <xcb/xcb_renderutil.h>
 #include <xcb/xkb.h>
 #undef explicit
+
 int main(void)
 {
     /* BEGIN TEST: */
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 7733688124..a5b9afb130 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -144,6 +144,7 @@ extern \"C\" {
 #include <xf86drmMode.h>
 #include <xf86drm.h>
 }
+
 int main(void)
 {
     /* BEGIN TEST: */
@@ -188,8 +189,7 @@ qt_config_compile_test(egl_brcm
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 #include <bcm_host.h>
 
 int main(void)
@@ -208,8 +208,7 @@ qt_config_compile_test(egl_egldevice
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 int main(void)
@@ -230,8 +229,7 @@ qt_config_compile_test(egl_mali
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <EGL/fbdev_window.h>
+"#include <EGL/fbdev_window.h>
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
 
@@ -250,8 +248,7 @@ qt_config_compile_test(egl_mali_2
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 #include <GLES2/gl2.h>
 
 int main(void)
@@ -271,8 +268,7 @@ qt_config_compile_test(egl_viv
     COMPILE_OPTIONS # special case
         "-DEGL_API_FB=1" # special case
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 #include <EGL/eglvivante.h>
 
 int main(void)
@@ -297,8 +293,7 @@ qt_config_compile_test(egl_openwfd
     LIBRARIES
         EGL::EGL
     CODE
-"
-#include <wfd.h>
+"#include <wfd.h>
 
 int main(void)
 {
@@ -316,11 +311,11 @@ qt_config_compile_test(egl_rcar
         EGL::EGL
         GLESv2::GLESv2
     CODE
-"
-#include <EGL/egl.h>
+"#include <EGL/egl.h>
 extern \"C\" {
 extern unsigned long PVRGrfxServerInit(void);
 }
+
 int main(void)
 {
     /* BEGIN TEST: */
@@ -347,7 +342,6 @@ enum {
     e4 = SYN_REPORT,
 };
 
-
 int main(void)
 {
     /* BEGIN TEST: */
@@ -362,8 +356,7 @@ input_event buf[32];
 qt_config_compile_test(integrityfb
     LABEL "INTEGRITY framebuffer"
     CODE
-"
-#include <device/fbdriver.h>
+"#include <device/fbdriver.h>
 
 int main(void)
 {
@@ -378,8 +371,7 @@ FBDriver *driver = 0;
 qt_config_compile_test(linuxfb
     LABEL "LinuxFB"
     CODE
-"
-#include <linux/fb.h>
+"#include <linux/fb.h>
 #include <sys/kd.h>
 #include <sys/ioctl.h>
 
@@ -409,7 +401,6 @@ qt_config_compile_test(opengles3
 #  include <GLES3/gl3.h>
 #endif
 
-
 int main(void)
 {
     /* BEGIN TEST: */
@@ -429,8 +420,7 @@ qt_config_compile_test(opengles31
     LIBRARIES
         GLESv2::GLESv2
     CODE
-"
-#include <GLES3/gl31.h>
+"#include <GLES3/gl31.h>
 
 int main(void)
 {
@@ -448,8 +438,7 @@ qt_config_compile_test(opengles32
     LIBRARIES
         GLESv2::GLESv2
     CODE
-"
-#include <GLES3/gl32.h>
+"#include <GLES3/gl32.h>
 
 int main(void)
 {
@@ -492,6 +481,7 @@ qt_config_compile_test(xcb_syslibs
 #include <xcb/xcb_renderutil.h>
 #include <xcb/xkb.h>
 #undef explicit
+
 int main(void)
 {
     /* BEGIN TEST: */