Skip to content
Snippets Groups Projects
Commit 6eb4380f authored by Axel Naumann's avatar Axel Naumann
Browse files

Silence warnings issued by Qt

/usr/include/qt4/QtCore/qsharedpointer_impl.h:435:17: error: 'register' storage class specifier is deprecated [-Werror,-Wdeprecated-register]
                register int tmp = o->strongref;
                ^~~~~~~~~
/usr/include/qt4/QtCore/qsharedpointer_impl.h:595:43: error: field 'd' is uninitialized when used here [-Werror,-Wuninitialized]
    inline QWeakPointer(X *ptr) : d(ptr ? d->getAndRef(ptr) : 0), value(ptr)
parent 414ec2f1
No related branches found
No related tags found
No related merge requests found
......@@ -52,7 +52,7 @@ GQTCXXFLAGS := $(QT4CPPFLAGS) $(QT3CPPFLAGS) $(QT3QT4CPPFLAGS)
ifeq ($(ARCH),win32)
GQTCXXFLAGS += -I$(QTDIR)/mkspecs/win32-msvc2005
else
GQTCXXFLAGS += -I$(QTDIR)/mkspecs/default
GQTCXXFLAGS += -I$(QTDIR)/mkspecs/default
endif
GQTCXXFLAGS += -I. $(QTINCDIR:%=-I%)
......@@ -128,6 +128,12 @@ ifeq ($(subst $(GCC_MINOR),,0 1),0 1)
$(GQTO): CXXFLAGS += -Wno-strict-overflow
endif
endif
ifneq ($(CLANG_MAJOR)$(GCC_MAJOR),)
# Building with clang or GCC
$(GQTO) : CXXFLAGS += -Wno-deprecated-register -Wno-uninitialized
$(GQTDO) : CXXFLAGS += -Wno-deprecated-register -Wno-uninitialized
$(GQTMOCO): CXXFLAGS += -Wno-deprecated-register -Wno-uninitialized
endif
$(GQTMOC) : $(call stripsrc,$(GQTDIRS)/moc_%.cxx): $(GQTDIRI)/%.h
$(MAKEDIR)
......@@ -137,6 +143,7 @@ else
$(QTMOCEXE) $(GQTCXXFLAGS) $< -o $@
endif
##### cintdlls ######
# qtcint is not longer part of the cintdlls
......
......@@ -34,6 +34,12 @@ QTGSIDEP := $(QTGSIO:.o=.d) $(QTGSIDO:.o=.d) $(QTGSIMOCO:.o=.d)
QTGSICXXFLAGS := -DQT3_SUPPORT -DQT_DLL -DQT_THREAD_SUPPORT -I. $(QTINCDIR:%=-I%)
ifneq ($(CLANG_MAJOR)$(GCC_MAJOR),)
# Building with clang or GCC
QTGSICXXFLAGS += -Wno-deprecated-register -Wno-uninitialized
endif
QTGSILIB := $(LPATH)/libQtGSI.$(SOEXT)
QTGSIMAP := $(QTGSILIB:.$(SOEXT)=.rootmap)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment