[Libreoffice-commits] .: 2 commits - fpicker/Executable_kdefilepicker.mk fpicker/Library_fps_kde4.mk fpicker/Library_fps_kde.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/unx
Lubos Lunak
llunak at kemper.freedesktop.org
Mon Feb 27 05:11:34 PST 2012
fpicker/Executable_kdefilepicker.mk | 5 +++
fpicker/Library_fps_kde.mk | 7 ++++
fpicker/Library_fps_kde4.mk | 5 +++
vcl/Library_vclplug_kde.mk | 7 ++++
vcl/Library_vclplug_kde4.mk | 6 +++
vcl/unx/kde4/KDEXLib.hxx | 2 -
vcl/unx/kde4/warning_guard_qhash.h | 58 ------------------------------------
7 files changed, 31 insertions(+), 59 deletions(-)
New commits:
commit a667f08798297b9fa5f78a327250f24cb8b1638c
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Mon Feb 27 14:10:59 2012 +0100
disable warnigns as errors for KDE3 code
Too old codebase, there simply have to be warnings.
diff --git a/fpicker/Library_fps_kde.mk b/fpicker/Library_fps_kde.mk
index f442f86..d833763 100644
--- a/fpicker/Library_fps_kde.mk
+++ b/fpicker/Library_fps_kde.mk
@@ -53,4 +53,6 @@ $(eval $(call gb_Library_add_cxxflags,fps_kde,\
-Wno-shadow \
))
+$(eval $(call gb_LIbrary_set_warnings_not_errors,fps_kde))
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 139479f..3f9e66a 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_kde,\
-Wno-shadow \
))
+$(eval $(call gb_Library_set_warnings_not_errors,vclplug_kde))
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
commit 9974eed353263cf10b966000f99f8e69233382a9
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Feb 24 17:27:21 2012 +0100
disable -Wshadow for KDE backends
KDE/Qt consider -Wshadow not worth the trouble, and the qhash
workaround shows why.
diff --git a/fpicker/Executable_kdefilepicker.mk b/fpicker/Executable_kdefilepicker.mk
index 9f8cca2..a5c95fb 100644
--- a/fpicker/Executable_kdefilepicker.mk
+++ b/fpicker/Executable_kdefilepicker.mk
@@ -58,4 +58,9 @@ $(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\
$(eval $(call gb_Executable_set_warnings_not_errors,kdefilepicker))
+# KDE/Qt consider -Wshadow more trouble than benefit
+$(eval $(call gb_Executable_add_cxxflags,kdefilepicker,\
+ -Wno-shadow \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_kde.mk b/fpicker/Library_fps_kde.mk
index 5624fd6..f442f86 100644
--- a/fpicker/Library_fps_kde.mk
+++ b/fpicker/Library_fps_kde.mk
@@ -48,4 +48,9 @@ $(eval $(call gb_Library_add_exception_objects,fps_kde,\
fpicker/source/unx/kde_unx/UnxNotifyThread \
))
+# KDE/Qt consider -Wshadow more trouble than benefit
+$(eval $(call gb_Library_add_cxxflags,fps_kde,\
+ -Wno-shadow \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_kde4.mk b/fpicker/Library_fps_kde4.mk
index 10a06c7..d806737 100644
--- a/fpicker/Library_fps_kde4.mk
+++ b/fpicker/Library_fps_kde4.mk
@@ -65,4 +65,9 @@ $(eval $(call gb_Library_add_generated_cxxobjects,fps_kde4,\
CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc \
))
+# KDE/Qt consider -Wshadow more trouble than benefit
+$(eval $(call gb_Library_add_cxxflags,fps_kde4,\
+ -Wno-shadow \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index d1c6f6d..139479f 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -85,6 +85,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
vcl/unx/kde/salnativewidgets-kde \
))
+# KDE/Qt consider -Wshadow more trouble than benefit
+$(eval $(call gb_Library_add_cxxflags,vclplug_kde,\
+ -Wno-shadow \
+))
+
+
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
dl \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 34d2892..e26e054 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -94,6 +94,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
vcl/unx/kde4/VCLKDEApplication \
))
+# KDE/Qt consider -Wshadow more trouble than benefit
+$(eval $(call gb_Library_add_cxxflags,fps_kde4,\
+ -Wno-shadow \
+))
+
+
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
dl \
diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index 9297be5..497a97f 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -32,7 +32,7 @@
#include <fixx11h.h>
-#include "warning_guard_qhash.h"
+#include <qhash.h>
#include <qsocketnotifier.h>
#include <qtimer.h>
diff --git a/vcl/unx/kde4/warning_guard_qhash.h b/vcl/unx/kde4/warning_guard_qhash.h
deleted file mode 100644
index a6a520c..0000000
--- a/vcl/unx/kde4/warning_guard_qhash.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2011 Red Hat, Inc., Eike Rathke <erack at redhat.com>
- * (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-#ifndef INCLUDED_WARNINGS_GUARD_QHASH_H
-#define INCLUDED_WARNINGS_GUARD_QHASH_H
-
-// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation
-// units and more important affects the rest of the current include file, the
-// warnings guard is separated into this header file on its own.
-
-/*
- Silence down this WaE:
- /usr/include/qt4/QtCore/qscopedpointer.h:83:47: error: declaration of ‘pointer’
- shadows a global declaration [-Werror=shadow]
-
- Reported upstream as <https://bugreports.qt.nokia.com/browse/QTBUG-22908>.
-
- And suggested to be closed, because there is no problem in Qt. This is a workaround, at best.
-*/
-
-#ifdef _MSC_VER
-#pragma warning(push, 1)
-#elif defined __GNUC__
-#pragma GCC system_header
-#endif
-#include <qhash.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#endif // INCLUDED_WARNINGS_GUARD_QHASH_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list