Permalink
Browse files

3rdparty: Update versions

  • Loading branch information...
3unjee committed Jan 5, 2019
1 parent c25ef5a commit d82e2082c13699cca1783c12f62903ce1575e23d
Showing with 21 additions and 19 deletions.
  1. +3 −3 3rdparty.sh
  2. +2 −2 build.sh
  3. +3 −3 configure.sh
  4. +6 −6 deploy.sh
  5. +5 −3 dist/changes/1.4.1.md
  6. +2 −2 src/SkCore/src/controllers/WControllerApplication.cpp
@@ -10,11 +10,11 @@ external="../3rdparty"
#--------------------------------------------------------------------------------------------------

Qt4_version="4.8.7"
Qt5_version="5.11.2"
Qt5_version="5.12.0"

VLC_version="3.0.4"
VLC_version="3.0.5"

libtorrent_version="1.1.9"
libtorrent_version="1.1.11"

Boost_version="1.55.0"

@@ -12,9 +12,9 @@ external="/c/dev/workspace/3rdparty"
#--------------------------------------------------------------------------------------------------

Qt4_version="4.8.7"
Qt5_version="5.11.2"
Qt5_version="5.12.0"

MinGW_version="5.3.0"
MinGW_version="7.3.0"

#--------------------------------------------------------------------------------------------------

@@ -10,11 +10,11 @@ external="../3rdparty"
#--------------------------------------------------------------------------------------------------

Qt4_version="4.8.7"
Qt5_version="5.11.2"
Qt5_version="5.12.0"

VLC_version="3.0.4"
VLC_version="3.0.5"

libtorrent_version="1.1.9"
libtorrent_version="1.1.11"

Boost_version="1.55.0"

@@ -10,13 +10,13 @@ external="../3rdparty"
#--------------------------------------------------------------------------------------------------

Qt4_version="4.8.7"
Qt5_version="5.11.2"
Qt5_version="5.12.0"

MinGW_version="5.3.0"
MinGW_version="7.3.0"

VLC_version="3.0.4"
VLC_version="3.0.5"

libtorrent_version="1.1.9"
libtorrent_version="1.1.11"

#--------------------------------------------------------------------------------------------------

@@ -128,7 +128,7 @@ if [ $1 = "qt4" ]; then

if [ $2 = "win32" ]; then

cp "$MinGW"/libgcc_s_dw2-1.dll deploy
cp "$MinGW"/libgcc_s_seh-1.dll deploy
cp "$MinGW"/libstdc++-6.dll deploy
cp "$MinGW"/libwinpthread-1.dll deploy

@@ -179,7 +179,7 @@ else

if [ $2 = "win32" ]; then

cp "$MinGW"/libgcc_s_dw2-1.dll deploy
cp "$MinGW"/libgcc_s_seh-1.dll deploy
cp "$MinGW"/libstdc++-6.dll deploy
cp "$MinGW"/libwinpthread-1.dll deploy

@@ -110,11 +110,13 @@

## 3rdparty

- [Qt](http://download.qt.io/official_releases/qt): Update to 5.11.2.
- [MinGW](https://sourceforge.net/projects/mingw): Update to 7.3.0.

- [VLC](http://github.com/videolan/vlc): Update to 3.0.4.
- [Qt](http://download.qt.io/official_releases/qt): Update to 5.12.0.

- [libtorrent](http://github.com/arvidn/libtorrent): Update to 1.1.9.
- [VLC](http://github.com/videolan/vlc): Update to 3.0.5.

- [libtorrent](http://github.com/arvidn/libtorrent): Update to 1.1.11.


# Authors
@@ -432,8 +432,8 @@ QMimeData * WControllerApplication::duplicateMime(const QMimeData * source)
/* Q_INVOKABLE static */ bool WControllerApplication::runAdmin(const QString & fileName)
{
#ifdef Q_OS_WIN
int result = (int) ShellExecuteA(NULL, "runas", fileName.toUtf8().constData(), "--updater",
NULL, SW_SHOWNORMAL);
uintptr_t result = (uintptr_t) ShellExecuteA(NULL, "runas", fileName.toUtf8().constData(),
"--updater", NULL, SW_SHOWNORMAL);

return (result > 32);
#else

0 comments on commit d82e208

Please sign in to comment.