+ build with Qt < 4.7 and OCC < 6.5

FreeCAD · Sep 20, 2014 · 26e01e0 · 26e01e0
1 parent 6a89b33
commit 26e01e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Gui/SelectionView.cpp b/src/Gui/SelectionView.cpp
@@ -58,7 +58,9 @@ SelectionView::SelectionView(Gui::Document* pcDocument, QWidget *parent)
     pLayout->setMargin ( 0 );
 
     QLineEdit* searchBox = new QLineEdit(this);
+#if QT_VERSION >= 0x040700
     searchBox->setPlaceholderText( tr( "Search" ) );
+#endif
     searchBox->setToolTip( tr( "Searches object labels" ) );
     pLayout->addWidget( searchBox );
     QHBoxLayout* llayout = new QHBoxLayout(searchBox);

diff --git a/src/Mod/Part/App/OCCError.h b/src/Mod/Part/App/OCCError.h
@@ -27,7 +27,9 @@
 # include <Standard_Failure.hxx>
 # include <Standard_AbortiveTransaction.hxx>
 # include <Standard_ConstructionError.hxx>
+# if OCC_VERSION_HEX >= 0x060500
 # include <Standard_DefineException.hxx>
+# endif
 # include <Standard_DimensionError.hxx>
 # include <Standard_DimensionMismatch.hxx>
 # include <Standard_DivideByZero.hxx>