summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2021-02-12 12:31:17 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2021-02-15 13:43:52 +0100
commit73fbf8bd303053a091fc63d0ad741a071bb50fae (patch)
tree6c0925d94b9b7e109602895159cad6c515b068ff /src/gui
parent5645ef305ad02ffec6591e7331cc8df30ba3572a (diff)
Simplify test-snippets in configure.cmake
The main(void) signature obviates the need for unused parameters and has existed since (at least) C89; so use that instead of the old-fashioned argc/argv arguments we don't use in any of these tests. Change-Id: Ibfe850a1fce378673c9781011475ea623fd75ad4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/.prev_configure.cmake48
-rw-r--r--src/gui/configure.cmake48
2 files changed, 32 insertions, 64 deletions
diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake
index cd962e8667..a9d8ec4cb7 100644
--- a/src/gui/.prev_configure.cmake
+++ b/src/gui/.prev_configure.cmake
@@ -144,9 +144,8 @@ extern \"C\" {
#include <xf86drmMode.h>
#include <xf86drm.h>
}
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
drmModeAtomicReq *request;
/* END TEST: */
@@ -169,9 +168,8 @@ qt_config_compile_test(egl_x11
#include <EGL/egl.h>
#include <X11/Xlib.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
Display *dpy = EGL_DEFAULT_DISPLAY;
EGLNativeDisplayType egldpy = XOpenDisplay(\"\");
@@ -194,9 +192,8 @@ qt_config_compile_test(egl_brcm
#include <EGL/egl.h>
#include <bcm_host.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
vc_dispmanx_display_open(0);
/* END TEST: */
@@ -215,9 +212,8 @@ qt_config_compile_test(egl_egldevice
#include <EGL/egl.h>
#include <EGL/eglext.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
EGLDeviceEXT device = 0;
EGLStreamKHR stream = 0;
@@ -239,9 +235,8 @@ qt_config_compile_test(egl_mali
#include <EGL/egl.h>
#include <GLES2/gl2.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
fbdev_window *w = 0;
/* END TEST: */
@@ -259,9 +254,8 @@ qt_config_compile_test(egl_mali_2
#include <EGL/egl.h>
#include <GLES2/gl2.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
mali_native_window *w = 0;
/* END TEST: */
@@ -279,9 +273,8 @@ qt_config_compile_test(egl_viv
#include <EGL/egl.h>
#include <EGL/eglvivante.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
#ifdef __INTEGRITY
fbGetDisplay();
@@ -305,9 +298,8 @@ qt_config_compile_test(egl_openwfd
"
#include <wfd.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
wfdEnumerateDevices(nullptr, 0, nullptr);
/* END TEST: */
@@ -327,9 +319,8 @@ qt_config_compile_test(egl_rcar
extern \"C\" {
extern unsigned long PVRGrfxServerInit(void);
}
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
PVRGrfxServerInit();
/* END TEST: */
@@ -355,9 +346,8 @@ enum {
};
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
input_event buf[32];
(void) buf;
@@ -373,9 +363,8 @@ qt_config_compile_test(integrityfb
"
#include <device/fbdriver.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
FBDriver *driver = 0;
/* END TEST: */
@@ -392,9 +381,8 @@ qt_config_compile_test(linuxfb
#include <sys/kd.h>
#include <sys/ioctl.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
fb_fix_screeninfo finfo;
fb_var_screeninfo vinfo;
@@ -420,9 +408,8 @@ qt_config_compile_test(opengles3
#endif
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
static GLfloat f[6];
glGetStringi(GL_EXTENSIONS, 0);
@@ -443,9 +430,8 @@ qt_config_compile_test(opengles31
"
#include <GLES3/gl31.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
glDispatchCompute(1, 1, 1);
glProgramUniform1i(0, 0, 0);
@@ -463,9 +449,8 @@ qt_config_compile_test(opengles32
"
#include <GLES3/gl32.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
glFramebufferTexture(GL_TEXTURE_2D, GL_DEPTH_STENCIL_ATTACHMENT, 1, 0);
/* END TEST: */
@@ -505,9 +490,8 @@ qt_config_compile_test(xcb_syslibs
#include <xcb/xcb_renderutil.h>
#include <xcb/xkb.h>
#undef explicit
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
int primaryScreen = 0;
xcb_connection_t *c = xcb_connect(\"\", &primaryScreen);
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 2dca0e1742..7733688124 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -144,9 +144,8 @@ extern \"C\" {
#include <xf86drmMode.h>
#include <xf86drm.h>
}
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
drmModeAtomicReq *request;
/* END TEST: */
@@ -169,9 +168,8 @@ qt_config_compile_test(egl_x11
#include <EGL/egl.h>
#include <X11/Xlib.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
Display *dpy = EGL_DEFAULT_DISPLAY;
EGLNativeDisplayType egldpy = XOpenDisplay(\"\");
@@ -194,9 +192,8 @@ qt_config_compile_test(egl_brcm
#include <EGL/egl.h>
#include <bcm_host.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
vc_dispmanx_display_open(0);
/* END TEST: */
@@ -215,9 +212,8 @@ qt_config_compile_test(egl_egldevice
#include <EGL/egl.h>
#include <EGL/eglext.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
EGLDeviceEXT device = 0;
EGLStreamKHR stream = 0;
@@ -239,9 +235,8 @@ qt_config_compile_test(egl_mali
#include <EGL/egl.h>
#include <GLES2/gl2.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
fbdev_window *w = 0;
/* END TEST: */
@@ -259,9 +254,8 @@ qt_config_compile_test(egl_mali_2
#include <EGL/egl.h>
#include <GLES2/gl2.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
mali_native_window *w = 0;
/* END TEST: */
@@ -281,9 +275,8 @@ qt_config_compile_test(egl_viv
#include <EGL/egl.h>
#include <EGL/eglvivante.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
#ifdef __INTEGRITY
fbGetDisplay();
@@ -307,9 +300,8 @@ qt_config_compile_test(egl_openwfd
"
#include <wfd.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
wfdEnumerateDevices(nullptr, 0, nullptr);
/* END TEST: */
@@ -329,9 +321,8 @@ qt_config_compile_test(egl_rcar
extern \"C\" {
extern unsigned long PVRGrfxServerInit(void);
}
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
PVRGrfxServerInit();
/* END TEST: */
@@ -357,9 +348,8 @@ enum {
};
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
input_event buf[32];
(void) buf;
@@ -375,9 +365,8 @@ qt_config_compile_test(integrityfb
"
#include <device/fbdriver.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
FBDriver *driver = 0;
/* END TEST: */
@@ -394,9 +383,8 @@ qt_config_compile_test(linuxfb
#include <sys/kd.h>
#include <sys/ioctl.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
fb_fix_screeninfo finfo;
fb_var_screeninfo vinfo;
@@ -422,9 +410,8 @@ qt_config_compile_test(opengles3
#endif
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
static GLfloat f[6];
glGetStringi(GL_EXTENSIONS, 0);
@@ -445,9 +432,8 @@ qt_config_compile_test(opengles31
"
#include <GLES3/gl31.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
glDispatchCompute(1, 1, 1);
glProgramUniform1i(0, 0, 0);
@@ -465,9 +451,8 @@ qt_config_compile_test(opengles32
"
#include <GLES3/gl32.h>
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
glFramebufferTexture(GL_TEXTURE_2D, GL_DEPTH_STENCIL_ATTACHMENT, 1, 0);
/* END TEST: */
@@ -507,9 +492,8 @@ qt_config_compile_test(xcb_syslibs
#include <xcb/xcb_renderutil.h>
#include <xcb/xkb.h>
#undef explicit
-int main(int argc, char **argv)
+int main(void)
{
- (void)argc; (void)argv;
/* BEGIN TEST: */
int primaryScreen = 0;
xcb_connection_t *c = xcb_connect(\"\", &primaryScreen);