mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(app): coding style

Browse source
This commit is contained in:
Ronan Abhamon 2018-04-16 09:37:24 +02:00
parent 0ef704e72c
commit a432a9d4e2
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
assets/icons/genicons.sh
View file

@ -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

2
build/CMakeLists.txt
View file

@ -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}")

24
build/rpm/linphone.spec.cmake
View file

@ -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,-)

10
src/components/file/FileDownloader.cpp
View file

@ -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();

1
tools/build_qt_rpm
View file

@ -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