...
 
Commits (4)
......@@ -887,7 +887,7 @@ void Core::loadPlugin(const QString& _filename,const bool _silent, QString& _lic
}
emit log(LOGOUT,tr("Plugin Desciption :\t %1 ").arg( basePlugin->description()) );
emit log(LOGOUT,tr("Plugin Description :\t %1 ").arg( basePlugin->description()) );
supported = "BaseInterface ";
......
......@@ -28,13 +28,17 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
endif()
if (QT5_FOUND)
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.9.0" )
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0")
else()
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.8.0" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1")
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0")
else()
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5")
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.10.1" )
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.10.1")
else()
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.9.0" )
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0")
else()
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.8.0" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1")
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0")
else()
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5")
endif()
endif()
endif()
else()
......
......@@ -129,7 +129,7 @@ LoggerWidget::LoggerWidget( QWidget *parent)
allButton_ = new QPushButton(QIcon(path + "status_all.png"),tr("All Messages"));
allButton_->setCheckable(true);
allButton_->setAutoExclusive(true);
infoButton_ = new QPushButton(QIcon(path + "status_green.png"),tr("Informations"));
infoButton_ = new QPushButton(QIcon(path + "status_green.png"),tr("Information"));
infoButton_->setCheckable(true);
infoButton_->setAutoExclusive(true);
warnButton_ = new QPushButton(QIcon(path + "status_yellow.png"),tr("Warnings"));
......