StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.17-dev'

Browse Source
This commit is contained in:
Anthony Bilinski 2020-11-23 02:53:10 -08:00
commit 425e3f6518
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
11 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -146,6 +146,7 @@ jobs:
- /opt/build-windows/x86_64 - /opt/build-windows/x86_64
- stage: "macOS, AppImage and Flatpak" - stage: "macOS, AppImage and Flatpak"
os: osx os: osx
osx_image: xcode10.2 # macOS 10.14, oldest supported SDK according to https://developer.apple.com/support/xcode/
env: JOB=build-osx env: JOB=build-osx
cache: cache:
timeout: 300 # seconds timeout: 300 # seconds

29
CHANGELOG.md
View File

@ -1,3 +1,32 @@
<a name="v1.17.3"></a>
## v1.17.3 (2020-11-22)
#### Features
* **osx:** Add support for macOS 10.16, remove support for macOS 10.13 ([238b2478](https://github.com/qTox/qTox/commit/238b24787e4f53a79086344050cb55edf2287e08))
* **windows:**
* Build our own gdb ([3092107a](https://github.com/qTox/qTox/commit/3092107a134a772b93b36ba57a9c58ad8d0ea18b))
* Make sure no dlls are missing ([3e6bc9b1](https://github.com/qTox/qTox/commit/3e6bc9b146fd5cecac062dbd3b6b18b4c1323156))
* Link all Windows deps dynamically ([5219ebc1](https://github.com/qTox/qTox/commit/5219ebc1fb30486196d91959fb9c5898742a874b))
#### Bug Fixes
* **build:** cache debug deps during 2nd stage ([2712bc68](https://github.com/qTox/qTox/commit/2712bc68a54f3756d41c6164f72425f82fd1bc97))
* **osx:**
* Allow rebuild using build script ([b5538c3f](https://github.com/qTox/qTox/commit/b5538c3f46a32e299c0bcc985ae9e703a1568344))
* Fix missing variables in macOS build script ([f741ac99](https://github.com/qTox/qTox/commit/f741ac99e65efb453a5c437502ae280bf637dd47))
* Update deprecated QDateTime and QProcess APIs ([08abedb6](https://github.com/qTox/qTox/commit/08abedb65513f88699244951889771573a8db588))
* don't tap kde-mac/kde since it us deprecated and unused ([b42ac760](https://github.com/qTox/qTox/commit/b42ac76011d9e65b10b6b9c27998f35df90b3dfa))
* **tools:**
* Add Windows to toxcore version update script ([3ff53e8f](https://github.com/qTox/qTox/commit/3ff53e8ff685f67087f40cda4dfc26f49b91cc09))
* Use correct hash when automatically updating flatpak version ([9fb96b08](https://github.com/qTox/qTox/commit/9fb96b08c368e3b7bb6052d6d490a8c66e46877d))
* use a subdirectory for release source archives ([533f25e2](https://github.com/qTox/qTox/commit/533f25e25a37fc9c348c8dc03f1c6c9249a8d8b5))
* **travis:** Install virtualenv for nightly build upload script ([bd5bdf18](https://github.com/qTox/qTox/commit/bd5bdf183159f8bcbc02ae1e9023c3655c52efa1))
* **windows:** iconengines not being installed ([399c0231](https://github.com/qTox/qTox/commit/399c023131415b515e7390aa945c9c7ec0fbd9e5))
<a name=""></a> <a name=""></a>
## v1.17.2 (2020-04-26) ## v1.17.2 (2020-04-26)

9
CMakeLists.txt
View File

@ -60,15 +60,6 @@ execute_process(
OUTPUT_VARIABLE QT_PREFIX_PATH OUTPUT_VARIABLE QT_PREFIX_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(
COMMAND xcode-select -p
OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
set(CMAKE_OSX_SYSROOT
${CMAKE_OSX_SYSROOT}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}.sdk)
project(qtox) project(qtox)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.

10
README.md
View File

@ -158,20 +158,20 @@ AED3 1134 9C23 A123 E5C4 AA4B 139C A045 3DA2 D773
``` ```
[#qtox@freenode]: https://webchat.freenode.net/?channels=qtox [#qtox@freenode]: https://webchat.freenode.net/?channels=qtox
[64 bit release]: https://github.com/qTox/qTox/releases/download/v1.17.2/setup-qtox-x86_64-release.exe [64 bit release]: https://github.com/qTox/qTox/releases/download/v1.17.3/setup-qtox-x86_64-release.exe
[32 bit release]: https://github.com/qTox/qTox/releases/download/v1.17.2/setup-qtox-i686-release.exe [32 bit release]: https://github.com/qTox/qTox/releases/download/v1.17.3/setup-qtox-i686-release.exe
[32nightly]: https://github.com/qTox/qTox-nightly-releases/releases/download/ci-master-latest/setup-qtox-i686-release.exe [32nightly]: https://github.com/qTox/qTox-nightly-releases/releases/download/ci-master-latest/setup-qtox-i686-release.exe
[64nightly]: https://github.com/qTox/qTox-nightly-releases/releases/download/ci-master-latest/setup-qtox-x86_64-release.exe [64nightly]: https://github.com/qTox/qTox-nightly-releases/releases/download/ci-master-latest/setup-qtox-x86_64-release.exe
[Flatpak]: https://github.com/qTox/qTox/releases/download/v1.17.2/qTox-v1.17.2.x86_64.flatpak [Flatpak]: https://github.com/qTox/qTox/releases/download/v1.17.3/qTox-v1.17.3.x86_64.flatpak
[Flatpak nightly]: https://github.com/qTox/qTox-nightly-releases/releases/download/ci-master-latest/qtox.flatpak [Flatpak nightly]: https://github.com/qTox/qTox-nightly-releases/releases/download/ci-master-latest/qtox.flatpak
[AppImage]: https://github.com/qTox/qTox/releases/download/v1.17.2/qTox-v1.17.2.x86_64.AppImage [AppImage]: https://github.com/qTox/qTox/releases/download/v1.17.3/qTox-v1.17.3.x86_64.AppImage
[AppImage nightly]: https://github.com/qTox/qTox-nightly-releases/releases/tag/ci-master-latest [AppImage nightly]: https://github.com/qTox/qTox-nightly-releases/releases/tag/ci-master-latest
[Arch]: /INSTALL.md#arch [Arch]: /INSTALL.md#arch
[Building instructions]: /INSTALL.md#os-x [Building instructions]: /INSTALL.md#os-x
[Contributing]: /CONTRIBUTING.md#how-to-start-contributing [Contributing]: /CONTRIBUTING.md#how-to-start-contributing
[Debian]: https://packages.debian.org/search?keywords=qtox [Debian]: https://packages.debian.org/search?keywords=qtox
[easy issues]: https://github.com/qTox/qTox/labels/E-easy [easy issues]: https://github.com/qTox/qTox/labels/E-easy
[Latest release]: https://github.com/qTox/qTox/releases/download/v1.17.2/qTox.dmg [Latest release]: https://github.com/qTox/qTox/releases/download/v1.17.3/qTox.dmg
[Latest nightly]: https://github.com/qTox/qTox-nightly-releases/releases/download/ci-master-latest/qTox.dmg [Latest nightly]: https://github.com/qTox/qTox-nightly-releases/releases/download/ci-master-latest/qTox.dmg
[Fedora]: /INSTALL.md#fedora [Fedora]: /INSTALL.md#fedora
[Gentoo]: /INSTALL.md#gentoo [Gentoo]: /INSTALL.md#gentoo

4
osx/info.plist
View File

@ -65,7 +65,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.17.2</string> <string>1.17.3</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>toxq</string> <string>toxq</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
@ -84,7 +84,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.17.2</string> <string>1.17.3</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
<string>NSApplication</string> <string>NSApplication</string>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>

2
res/io.github.qtox.qTox.appdata.xml
View File

@ -68,7 +68,7 @@
<content_attribute id="social-audio">intense</content_attribute> <content_attribute id="social-audio">intense</content_attribute>
</content_rating> </content_rating>
<releases> <releases>
​ <release version="1.17.2" date="2020-04-26"/> ​ <release version="1.17.3" date="2020-11-22"/>
</releases> </releases>
</component> </component>

2
res/nodes.json
View File

File diff suppressed because one or more lines are too long

2
src/persistence/inotificationsettings.h
View File

@ -24,6 +24,8 @@
class INotificationSettings class INotificationSettings
{ {
public: public:
virtual ~INotificationSettings() = default;
virtual bool getNotify() const = 0; virtual bool getNotify() const = 0;
virtual void setNotify(bool newValue) = 0; virtual void setNotify(bool newValue) = 0;

2
windows/cross-compile/build.sh
View File

@ -134,7 +134,6 @@ apt-get install -y --no-install-recommends \
build-essential \ build-essential \
ca-certificates \ ca-certificates \
cmake \ cmake \
curl \
extra-cmake-modules \ extra-cmake-modules \
git \ git \
libtool \ libtool \
@ -144,6 +143,7 @@ apt-get install -y --no-install-recommends \
tclsh \ tclsh \
texinfo \ texinfo \
unzip \ unzip \
curl \
yasm \ yasm \
zip zip

2
windows/qtox.nsi
View File

@ -285,7 +285,7 @@ Section "Install"
${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}"
${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.17.2" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.17.3"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io"

2
windows/qtox64.nsi
View File

@ -286,7 +286,7 @@ Section "Install"
${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}"
${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.17.2" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.17.3"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe"
${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io"