Make sure to use QT4 even if QT5 is available

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 1761df6e77190bef639c0c527d24e891fb7fb417..07cfa2facfb9eefce062c243ad4f6d7ead0a417b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#endif
+#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
@@ -84,10 +82,7 @@ int main(int argc, char *argv[])
                {
                        const int loglevel = atoi(optarg);
                        sr_log_loglevel_set(loglevel);
-
-#ifdef ENABLE_SIGROKDECODE
                        srd_log_loglevel_set(loglevel);
-#endif
 
                        break;
                }
@@ -118,7 +113,6 @@ int main(int argc, char *argv[])
 
        do {
 
-#ifdef ENABLE_SIGROKDECODE
                // Initialise libsigrokdecode
                if (srd_init(NULL) != SRD_OK) {
                        qDebug() << "ERROR: libsigrokdecode init failed.";
@@ -127,7 +121,6 @@ int main(int argc, char *argv[])
 
                // Load the protocol decoders
                srd_decoder_load_all();
-#endif
 
                try {
                        // Create the device manager, initialise the drivers
@@ -160,10 +153,8 @@ int main(int argc, char *argv[])
                        qDebug() << e.what();
                }
 
-#ifdef ENABLE_SIGROKDECODE
                // Destroy libsigrokdecode
                srd_exit();
-#endif
 
        } while (0);