X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=main.cpp;h=0867187c57b23815dc6bb0de32efbe16001233cf;hb=refs%2Fheads%2Fmaster;hp=a307159c5005f92dfe26212e1c7f90fd1e7ca898;hpb=cf1541a18fcd007c9965a3199b9c4f917856b292;p=pulseview.git

diff --git a/main.cpp b/main.cpp
index a307159c..0867187c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -70,9 +70,11 @@
 
 #ifdef _WIN32
 #include <QtPlugin>
+#ifdef QT_STATIC
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
 Q_IMPORT_PLUGIN(QSvgPlugin)
 #endif
+#endif
 
 using std::exception;
 using std::ifstream;
@@ -330,7 +332,7 @@ int main(int argc, char *argv[])
 		// Create the device manager, initialise the drivers
 		pv::DeviceManager device_manager(context, driver, do_scan);
 
-		a.collect_version_info(context);
+		a.collect_version_info(device_manager);
 		if (show_version) {
 			a.print_version_info();
 		} else {
@@ -350,10 +352,9 @@ int main(int argc, char *argv[])
 #ifdef ENABLE_SIGNALS
 			if (SignalHandler::prepare_signals()) {
 				SignalHandler *const handler = new SignalHandler(&w);
-				QObject::connect(handler, SIGNAL(int_received()),
-					&w, SLOT(close()));
-				QObject::connect(handler, SIGNAL(term_received()),
-					&w, SLOT(close()));
+				QObject::connect(handler, SIGNAL(int_received()), &w, SLOT(close()));
+				QObject::connect(handler, SIGNAL(term_received()), &w, SLOT(close()));
+				QObject::connect(handler, SIGNAL(usr1_received()), &w, SLOT(on_run_stop_clicked()));
 			} else
 				qWarning() << "Could not prepare signal handler.";
 #endif