CMakeLists.txt: Put quotes back for CXX_FLAGS only

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 1761df6e77190bef639c0c527d24e891fb7fb417..23f3f62306c6a492b84d5e853c414f198248bde4 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,8 +18,8 @@
  * 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. */
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #endif
 
 #include <stdint.h>
@@ -27,7 +27,7 @@
 
 #include <getopt.h>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS
@@ -39,6 +39,12 @@
 
 #include "config.h"
 
+#ifdef _WIN32
+// The static qsvg lib is required for SVG graphics/icons (on Windows).
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qsvg)
+#endif
+
 void usage()
 {
        fprintf(stdout,
@@ -63,7 +69,7 @@ int main(int argc, char *argv[])
        // Set some application metadata
        QApplication::setApplicationVersion(PV_VERSION_STRING);
        QApplication::setApplicationName("PulseView");
-       QApplication::setOrganizationDomain("http://www.sigrok.org");
+       QApplication::setOrganizationDomain("sigrok.org");
 
        // Parse arguments
        while (1) {
@@ -85,7 +91,7 @@ int main(int argc, char *argv[])
                        const int loglevel = atoi(optarg);
                        sr_log_loglevel_set(loglevel);
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
                        srd_log_loglevel_set(loglevel);
 #endif
 
@@ -118,7 +124,7 @@ int main(int argc, char *argv[])
 
        do {
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
                // Initialise libsigrokdecode
                if (srd_init(NULL) != SRD_OK) {
                        qDebug() << "ERROR: libsigrokdecode init failed.";
@@ -160,7 +166,7 @@ int main(int argc, char *argv[])
                        qDebug() << e.what();
                }
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
                // Destroy libsigrokdecode
                srd_exit();
 #endif