diff --git a/DSView.icns b/DSView.icns new file mode 100644 index 00000000..d98f5351 Binary files /dev/null and b/DSView.icns differ diff --git a/DSView/main.cpp b/DSView/main.cpp index 6b45764b..3ec0a875 100755 --- a/DSView/main.cpp +++ b/DSView/main.cpp @@ -62,6 +62,7 @@ int main(int argc, char *argv[]) const char *open_file = NULL; #if QT_VERSION >= QT_VERSION_CHECK(5,6,0) + //On Windows, need to compile with the QT5 version of the library, which makes the interface slightly larger. QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); #endif // QT_VERSION diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp index 23fd92d0..0f3d01e4 100644 --- a/DSView/pv/appcontrol.cpp +++ b/DSView/pv/appcontrol.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "devicemanager.h" #include "sigsession.h" diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h index b4b7f9db..4de67805 100755 --- a/DSView/pv/sigsession.h +++ b/DSView/pv/sigsession.h @@ -321,7 +321,7 @@ private: // thread for hotplug void hotplug_proc(); - static int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev, + static LIBUSB_CALL int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev, libusb_hotplug_event event, void *user_data); public: diff --git a/applogo.rc b/applogo.rc new file mode 100644 index 00000000..5e20a8c3 --- /dev/null +++ b/applogo.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "DSView.icns" diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro index 575d247e..2637a9b8 100644 --- a/qtpro/DSView.pro +++ b/qtpro/DSView.pro @@ -375,4 +375,9 @@ RESOURCES += \ ICON = DSView.icns +RC_FILE += ../applogo.rc + MOC_DIR = ../../DSView_tmp/DSView_moc + +DISTFILES += \ + ../applogo.rc diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user index d7a2e816..1dc0ec18 100644 --- a/qtpro/DSView.pro.user +++ b/qtpro/DSView.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId