From 4afb02f01777016416e40ad406d78164da32c3c2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 4 Feb 2016 22:50:43 +0200 Subject: [PATCH] fix some compiler warnings Signed-off-by: Ivailo Monev --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp | 3 --- src/core/tools/qtextboundaryfinder.h | 1 - src/dbus/qdbuserror.h | 1 - src/imports/shaders/scenegraph/qsggeometry.h | 3 --- src/imports/shaders/shadereffectsource.cpp | 2 -- src/imports/shaders/shadereffectsource.h | 2 -- src/multimedia/audio/qaudioinput_alsa_p.h | 1 - src/multimedia/audio/qaudiooutput_alsa_p.h | 1 - src/xmlpatterns/projection/qprojectedexpression_p.h | 1 + 9 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp index ff2ac2b85..a7a46e743 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp @@ -109,9 +109,6 @@ DEFINE_int32(malloc_devmem_start, 0, DEFINE_int32(malloc_devmem_limit, 0, "Physical memory limit location in MB for /dev/mem allocation." " Setting this to 0 means no limit."); -#else -static const int32_t FLAGS_malloc_devmem_start = 0; -static const int32_t FLAGS_malloc_devmem_limit = 0; #endif #if HAVE(SBRK) diff --git a/src/core/tools/qtextboundaryfinder.h b/src/core/tools/qtextboundaryfinder.h index 6b2400e45..446baa3cc 100644 --- a/src/core/tools/qtextboundaryfinder.h +++ b/src/core/tools/qtextboundaryfinder.h @@ -101,7 +101,6 @@ private: int length; int pos; uint freePrivate : 1; - uint unused : 31; QTextBoundaryFinderPrivate *d; }; diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index 8e7d217ff..34dabd579 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -105,7 +105,6 @@ private: ErrorType code; QString msg; QString nm; - void *unused; }; #ifndef QT_NO_DEBUG_STREAM diff --git a/src/imports/shaders/scenegraph/qsggeometry.h b/src/imports/shaders/scenegraph/qsggeometry.h index f0d534247..0585f76b7 100644 --- a/src/imports/shaders/scenegraph/qsggeometry.h +++ b/src/imports/shaders/scenegraph/qsggeometry.h @@ -123,10 +123,7 @@ private: void *m_data; int m_index_data_offset; - void *m_reserved_pointer; - uint m_owns_data : 1; - uint m_reserved_bits : 31; float m_prealloc[16]; }; diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp index e8758d780..f80889bfa 100644 --- a/src/imports/shaders/shadereffectsource.cpp +++ b/src/imports/shaders/shadereffectsource.cpp @@ -79,8 +79,6 @@ ShaderEffectSource::ShaderEffectSource(QDeclarativeItem *parent) , m_refs(0) , m_dirtyTexture(true) , m_dirtySceneGraph(true) - , m_multisamplingSupported(false) - , m_checkedForMultisamplingSupport(false) , m_live(true) , m_hideSource(false) , m_mirrored(false) diff --git a/src/imports/shaders/shadereffectsource.h b/src/imports/shaders/shadereffectsource.h index cbc1cf816..a99de259b 100644 --- a/src/imports/shaders/shadereffectsource.h +++ b/src/imports/shaders/shadereffectsource.h @@ -145,8 +145,6 @@ private: int m_refs; bool m_dirtyTexture : 1; bool m_dirtySceneGraph : 1; - bool m_multisamplingSupported : 1; - bool m_checkedForMultisamplingSupport : 1; bool m_live : 1; bool m_hideSource : 1; bool m_mirrored : 1; diff --git a/src/multimedia/audio/qaudioinput_alsa_p.h b/src/multimedia/audio/qaudioinput_alsa_p.h index 265ea5738..cc92a4ff9 100644 --- a/src/multimedia/audio/qaudioinput_alsa_p.h +++ b/src/multimedia/audio/qaudioinput_alsa_p.h @@ -135,7 +135,6 @@ private: snd_async_handler_t* ahandler; snd_pcm_access_t access; snd_pcm_format_t pcmformat; - snd_timestamp_t* timestamp; snd_pcm_hw_params_t *hwparams; }; diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.h b/src/multimedia/audio/qaudiooutput_alsa_p.h index 8e0a2ab28..3761bdff1 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.h +++ b/src/multimedia/audio/qaudiooutput_alsa_p.h @@ -142,7 +142,6 @@ private: snd_async_handler_t* ahandler; snd_pcm_access_t access; snd_pcm_format_t pcmformat; - snd_timestamp_t* timestamp; snd_pcm_hw_params_t *hwparams; }; diff --git a/src/xmlpatterns/projection/qprojectedexpression_p.h b/src/xmlpatterns/projection/qprojectedexpression_p.h index 1a374d27d..565ebb00b 100644 --- a/src/xmlpatterns/projection/qprojectedexpression_p.h +++ b/src/xmlpatterns/projection/qprojectedexpression_p.h @@ -110,6 +110,7 @@ namespace QPatternist m_axis(axis) { Q_ASSERT(m_test); + Q_UNUSED(m_axis); } virtual Action actionForElement(const QXmlName name, -- 2.11.0