diff --git a/assets/icons/genicons.sh b/assets/icons/genicons.sh index f3ea90b62..d7fda1bfd 100755 --- a/assets/icons/genicons.sh +++ b/assets/icons/genicons.sh @@ -1,8 +1,7 @@ -#!/usr/bin/bash +#!/usr/bin/env bash for i in 16 22 24 32 64 128 do - mkdir -p hicolor/${i}x${i}/apps - inkscape -z -e hicolor/${i}x${i}/apps/linphone.png -w $i -h $i ../images/linphone_logo.svg + mkdir -p hicolor/${i}x${i}/apps + inkscape -z -e hicolor/${i}x${i}/apps/linphone.png -w $i -h $i ../images/linphone_logo.svg done - diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index cb19d1260..db1f219a0 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -48,7 +48,7 @@ set(CPACK_SOURCE_IGNORE_FILES bc_project_build_version(${PROJECT_VERSION} PROJECT_VERSION_BUILD) if(PROJECT_VERSION_BUILD) set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${PROJECT_VERSION_BUILD}") -endif () +endif() message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}") diff --git a/build/rpm/linphone.spec.cmake b/build/rpm/linphone.spec.cmake index 3703bc413..440df670d 100644 --- a/build/rpm/linphone.spec.cmake +++ b/build/rpm/linphone.spec.cmake @@ -58,20 +58,20 @@ make install DESTDIR=%{buildroot} rm -rf $RPM_BUILD_ROOT %post - /sbin/ldconfig - for i in 16 22 24 32 64 128 - do - xdg-icon-resource install --novendor --mode system --theme hicolor --context apps --size $i %{_datarootdir}/icons/hicolor/${i}x${i}/apps/linphone.png linphone - done - xdg-desktop-menu install --novendor --mode system %{_datarootdir}/applications/linphone.desktop + /sbin/ldconfig + for i in 16 22 24 32 64 128 + do + xdg-icon-resource install --novendor --mode system --theme hicolor --context apps --size $i %{_datarootdir}/icons/hicolor/${i}x${i}/apps/linphone.png linphone + done + xdg-desktop-menu install --novendor --mode system %{_datarootdir}/applications/linphone.desktop %postun - xdg-desktop-menu uninstall --mode system linphone.desktop - for i in 16 22 24 32 64 128 - do - xdg-icon-resource uninstall --mode system --theme hicolor --context apps --size $i linphone - done - /sbin/ldconfig + xdg-desktop-menu uninstall --mode system linphone.desktop + for i in 16 22 24 32 64 128 + do + xdg-icon-resource uninstall --mode system --theme hicolor --context apps --size $i linphone + done + /sbin/ldconfig %files %defattr(-,root,root,-) diff --git a/src/components/file/FileDownloader.cpp b/src/components/file/FileDownloader.cpp index 51a84f85c..3c69acd5c 100644 --- a/src/components/file/FileDownloader.cpp +++ b/src/components/file/FileDownloader.cpp @@ -78,13 +78,15 @@ void FileDownloader::download () { QNetworkRequest request(mUrl); mNetworkReply = mManager.get(request); + QNetworkReply *data = mNetworkReply.data(); + #if QT_CONFIG(ssl) - QObject::connect(mNetworkReply.data(), &QNetworkReply::sslErrors, this, &FileDownloader::handleSslErrors); + QObject::connect(data, &QNetworkReply::sslErrors, this, &FileDownloader::handleSslErrors); #endif - QObject::connect(mNetworkReply.data(), &QNetworkReply::downloadProgress, this, &FileDownloader::handleDownloadProgress); - QObject::connect(mNetworkReply.data(), &QNetworkReply::readyRead, this, &FileDownloader::handleReadyData); - QObject::connect(mNetworkReply.data(), &QNetworkReply::finished, this, &FileDownloader::handleDownloadFinished); + QObject::connect(data, &QNetworkReply::downloadProgress, this, &FileDownloader::handleDownloadProgress); + QObject::connect(data, &QNetworkReply::readyRead, this, &FileDownloader::handleReadyData); + QObject::connect(data, &QNetworkReply::finished, this, &FileDownloader::handleDownloadFinished); if (mDownloadFolder.isEmpty()) { mDownloadFolder = CoreManager::getInstance()->getSettingsModel()->getDownloadFolder(); diff --git a/tools/build_qt_rpm b/tools/build_qt_rpm index 56fd29bde..c03c77940 100755 --- a/tools/build_qt_rpm +++ b/tools/build_qt_rpm @@ -75,4 +75,3 @@ mkdir -p ${RPM_FOLDER}/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} tar --transform "s/^${REPO_FOLDER}/${RPM_NAME}/" -czvf ${RPM_FOLDER}/rpmbuild/SOURCES/${RPM_NAME}.tar.gz ${REPO_FOLDER}/ rpmbuild -bb --define "_topdir $PWD/${RPM_FOLDER}/rpmbuild" build/rpm/qt5.spec -