Moved decoder config into the popup

[pulseview.git] / pv / dialogs / about.cpp

diff --git a/pv/dialogs/about.cpp b/pv/dialogs/about.cpp
index 4065de554b2e6bedf92f26855184dee0245b7dc1..806dc4c5c057c6ee2bafa76e1700039230b18367 100644 (file)
--- a/pv/dialogs/about.cpp
+++ b/pv/dialogs/about.cpp
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h>
-#endif
+#include <libsigrokdecode/libsigrokdecode.h>
 
 #include <QTextDocument>
 
@@ -44,9 +42,7 @@ About::About(QWidget *parent) :
        struct sr_input_format **inputs;
        struct sr_output_format **outputs;
 
-#ifdef ENABLE_SIGROKDECODE
        struct srd_decoder *dec;
-#endif
 
        QString s;
 
@@ -56,7 +52,7 @@ About::About(QWidget *parent) :
        ui->versionInfo->setText(tr("%1 %2<br />%3<br /><a href=\"%4\">%4</a>")
                                 .arg(QApplication::applicationName())
                                 .arg(QApplication::applicationVersion())
-                                .arg(tr("GNU GPL, version 2 or later"))
+                                .arg(tr("GNU GPL, version 3 or later"))
                                 .arg(QApplication::organizationDomain()));
        ui->versionInfo->setOpenExternalLinks(true);
 
@@ -93,7 +89,6 @@ About::About(QWidget *parent) :
                        .arg(QString(outputs[i]->description)));
        }
 
-#ifdef ENABLE_SIGROKDECODE
        s.append("<tr><td colspan=\"2\"><b>" +
                tr("Supported protocol decoders:") +
                "</b></td></tr>");
@@ -103,7 +98,6 @@ About::About(QWidget *parent) :
                         .arg(QString(dec->id))
                         .arg(QString(dec->longname)));
        }
-#endif
 
        s.append("</table>");