diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
| commit | aaff94c2df665035addb90714bab4722003894da (patch) | |
| tree | 3af76e8aa4dbf86a86b1e4d2ad2f6dda06374ee0 /config.tests | |
| parent | 2302d386c7a1aa1a96658f79c236d6b8a59db7ac (diff) | |
| parent | 1196f691120d77ab3be55f21824aba645210fb8c (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/kernel/qplatformsystemtrayicon.cpp
src/gui/kernel/qplatformsystemtrayicon.h
src/plugins/platforms/xcb/xcb-plugin.pro
Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/glib/glib.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config.tests/unix/glib/glib.cpp b/config.tests/unix/glib/glib.cpp index 692e3173fa..f8abc824c6 100644 --- a/config.tests/unix/glib/glib.cpp +++ b/config.tests/unix/glib/glib.cpp @@ -39,10 +39,11 @@ int main(int, char **) { GMainContext *context; GSource *source; - GPollFD *pollfd; + GPollFD *pollfd = NULL; if (!g_thread_supported()) g_thread_init(NULL); context = g_main_context_default(); + (void)context; source = g_source_new(0, 0); g_source_add_poll(source, pollfd); return 0; |