Refs #10838. Suppress additional gcc warnings. Fix remaining warning.

mantidproject · Dec 19, 2014 · a3654ae · a3654ae
1 parent 5369bb4
commit a3654ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Code/Mantid/Build/CMake/CommonSetup.cmake b/Code/Mantid/Build/CMake/CommonSetup.cmake
@@ -242,7 +242,10 @@ endif ()
 if ( CMAKE_COMPILER_IS_GNUCXX )
   include ( GNUSetup )
 elseif ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
-  include ( GNUSetup )
+  # Remove once clang warnings have been fixed. 
+  if ( NOT APPLE)
+    include ( GNUSetup )
+  endif ()
 endif ()
 
 ###########################################################################

diff --git a/Code/Mantid/QtPropertyBrowser/src/qtvariantproperty.cpp b/Code/Mantid/QtPropertyBrowser/src/qtvariantproperty.cpp
@@ -192,7 +192,6 @@ static QtProperty *wrappedProperty(QtProperty *property)
 
 class QtVariantPropertyPrivate
 {
-    QtVariantProperty *q_ptr;
 public:
     QtVariantPropertyPrivate(QtVariantPropertyManager *m) : manager(m) {}