X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=d3c52adb15ebee8c03dbe52bf20c871d7d330440;hp=b0e631f6382cbd4697d2171e30ebab8620065989;hb=a6fa4d477d783478935a78c1b70596e38ae8ca64;hpb=720f47623827824dc77dd9dff643c06e570d9068 diff --git a/main.cpp b/main.cpp index b0e631f6..d3c52adb 100644 --- a/main.cpp +++ b/main.cpp @@ -70,9 +70,11 @@ #ifdef _WIN32 #include +#ifdef QT_STATIC Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QSvgPlugin) #endif +#endif using std::exception; using std::ifstream; @@ -278,6 +280,7 @@ int main(int argc, char *argv[]) qRegisterMetaType("uint64_t"); qRegisterMetaType("util::Timestamp"); qRegisterMetaType("SharedPtrToSegment"); + qRegisterMetaType>("shared_ptr"); // Prepare the global settings since logging needs them early on pv::GlobalSettings settings; @@ -349,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