diff --git a/src/gui/mainwidget.cpp b/src/gui/mainwidget.cpp index 37b9d06..b8b96b9 100644 --- a/src/gui/mainwidget.cpp +++ b/src/gui/mainwidget.cpp @@ -104,7 +104,7 @@ void MainWidget::deviceDisconnect() #ifndef Q_OS_WIN32 trayIcon->setIcon("qcma_off"); #else - trayIcon->setIcon("qcma_off_16"); + trayIcon->setIcon("tray/qcma_off_16"); #endif qDebug("Icon changed - disconnected"); setTrayTooltip(tr("Disconnected")); @@ -116,7 +116,7 @@ void MainWidget::deviceConnect(QString message) #ifndef Q_OS_WIN32 trayIcon->setIcon("qcma_on"); #else - trayIcon->setIcon("qcma_off_16"); + trayIcon->setIcon("tray/qcma_on_16"); #endif qDebug("Icon changed - connected"); setTrayTooltip(message); @@ -254,7 +254,7 @@ void MainWidget::createTrayIcon() #ifndef Q_OS_WIN32 trayIcon->setIcon("qcma_off"); #else - trayIcon->setIcon("qcma_off_16"); + trayIcon->setIcon("tray/qcma_off_16"); #endif trayIcon->show(); diff --git a/windows/qcma.nsi b/windows/qcma.nsi index 523fcb9..01f3f68 100644 --- a/windows/qcma.nsi +++ b/windows/qcma.nsi @@ -100,9 +100,9 @@ section "install" ${If} ${RunningX64} File "win_x86_64\qcma.exe" File "win_x86_64\qcma_console.exe" - File "win_x86_64\avcodec-55.dll" - File "win_x86_64\avformat-55.dll" - File "win_x86_64\avutil-52.dll" + File "win_x86_64\avcodec-56.dll" + File "win_x86_64\avformat-56.dll" + File "win_x86_64\avutil-54.dll" File "win_x86_64\iconv.dll" File "win_x86_64\libgcc_s_seh-1.dll" File "win_x86_64\libjpeg-8.dll" @@ -122,7 +122,8 @@ section "install" File "win_x86_64\Qt5Network.dll" File "win_x86_64\Qt5Sql.dll" File "win_x86_64\Qt5Widgets.dll" - File "win_x86_64\swscale-2.dll" + File "win_x86_64\swresample-1.dll" + File "win_x86_64\swscale-3.dll" File "win_x86_64\zlib1.dll" SetOutPath "$INSTDIR\platforms" @@ -138,9 +139,9 @@ section "install" ${Else} File "win_i686\qcma.exe" File "win_i686\qcma_console.exe" - File "win_i686\avcodec-55.dll" - File "win_i686\avformat-55.dll" - File "win_i686\avutil-52.dll" + File "win_i686\avcodec-56.dll" + File "win_i686\avformat-56.dll" + File "win_i686\avutil-54.dll" File "win_i686\iconv.dll" File "win_i686\libgcc_s_sjlj-1.dll" File "win_i686\libjpeg-8.dll" @@ -160,7 +161,8 @@ section "install" File "win_i686\Qt5Sql.dll" File "win_i686\Qt5Network.dll" File "win_i686\Qt5Widgets.dll" - File "win_i686\swscale-2.dll" + File "win_i686\swresample-1.dll" + File "win_i686\swscale-3.dll" File "win_i686\zlib1.dll" SetOutPath "$INSTDIR\platforms"