From 26e01e09001caad37249ef38297ecc8e06b4aa32 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 20 Sep 2014 17:49:29 +0200 Subject: [PATCH] + build with Qt < 4.7 and OCC < 6.5 --- src/Gui/SelectionView.cpp | 2 ++ src/Mod/Part/App/OCCError.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Gui/SelectionView.cpp b/src/Gui/SelectionView.cpp index ed8fa4483f6f..2a1be14fd03f 100644 --- 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 index 0cb1e4a6186e..183b225b8011 100644 --- a/src/Mod/Part/App/OCCError.h +++ b/src/Mod/Part/App/OCCError.h @@ -27,7 +27,9 @@ # include # include # include +# if OCC_VERSION_HEX >= 0x060500 # include +# endif # include # include # include