Commit Graph

6503 Commits

Author SHA1 Message Date
Mikkel Krautz
c8d088001a Re-run mkflags.py to remove non-existant '__.svg' from our flags QRC files. 2017-01-30 20:46:23 +01:00
Mikkel Krautz
867d4f6a3b Merge PR #2791: Update country flag icons 2017-01-30 18:50:21 +01:00
Jan Klass
5dbb124fed Update country flag icons
Update the flags with our script extract-emojione-flags.py from the most recent emojione version 2.2.7.

Emojione changed from rectangle flags to round representations.

Fixes #2732

Previously, the mumble_flags.qrc was split into several files, generated
by mkflags.py. This will now generate only one qrc file because the svg
files are substantially reduced in size, all together 440.638 bytes in
size (so the workaround would actually no longer be necessary, and we
actually get only one qrc file).
2017-01-30 18:39:48 +01:00
Mikkel Krautz
c936b99d32 Merge PR #2785: plugins: Use tabs for indentation, remove trailing whitespace 2017-01-29 13:54:18 +01:00
Davide Beatrici
474b3700ae plugins: Fix indentation and whitespace
* Use tabs for indentation
* Remove trailing whitespace
* Space indentation for alignment
2017-01-29 13:02:58 +01:00
Mikkel Krautz
82d385f6bd Merge PR #2780: installer: use "vcruntime140.dll" instead of "msvcr140.dll" for vcruntime140.dll's component ID. 2017-01-27 00:04:19 +01:00
Mikkel Krautz
ea1c1b3a29 installer: use "vcruntime140.dll" instead of "msvcr140.dll" for vcruntime140.dll's component ID.
I accidently neglected to rename this one instance to the new name in
MSVC2015. (The "msvcr" file is now "vcruntime".)

The rest of the references should be OK.
2017-01-27 00:02:43 +01:00
Mikkel Krautz
c3ebc173b5 Merge PR #2776: installer: use VC140 CRT. 2017-01-26 13:40:59 +01:00
Mikkel Krautz
452aa61ffe installer: use VC140 CRT.
Our builders are now running MSVC2015. Update the installer to work
with MSVC2015's CRT.
2017-01-26 13:39:35 +01:00
Mikkel Krautz
afd86cf919 Merge PR #2775: MVSC2015 toolchain fixes: ignore C4091 on v140_xp toolchain and fix UCRT lib path in toolchain files 2017-01-26 13:28:47 +01:00
Mikkel Krautz
09c22a5db1 toolchain: update win32-msvc2015 x64 and x86 toolchains to include ucrt lib dir.
The x86_xp toolchain already does this. It is necessary for link.exe to
link against the MSVC2015 CRT.
2017-01-26 13:26:59 +01:00
Mikkel Krautz
df4b0d85be compiler.pri: for win32-msvc, ignore C4091 when building against v140_xp toolset.
The Windows 7.1A SDK that is used when building with the v140_xp toolset
triggers the C4091 warning in multiple places. Instead of littering our
headers with pragmas, we ignore the warning everywhere via command-line
flag.

It shouldn't affect code quality. The x64 build doesn't ignore the warning
so we're bound to catch any warnings introduced in the future.
2017-01-26 13:25:32 +01:00
Mikkel Krautz
3cbccc5ffd Merge PR #2760: Update QSslDiffieHellmanParameters API calls to final Qt 5.8 API 2017-01-26 13:17:54 +01:00
Mikkel Krautz
cc4d32fda5 Merge PR #2774: WASAPI.h: Include missing header for MinGW on Linux 2017-01-25 23:11:27 +01:00
Davide Beatrici
d179468469
WASAPI.h: Include missing header for MinGW on Linux
This fixes an error when compiling with MinGW on Linux.
error: 'PKEY_Device_FriendlyName' was not declared in this scope
2017-01-25 22:14:46 +01:00
Mikkel Krautz
7e1fdaad68 Merge PR #2771: rcc.pri: Fix script path for MinGW on Linux 2017-01-25 20:53:36 +01:00
Mikkel Krautz
8fc69fe38c Merge PR #2772: WASAPI.h: Change header name capitalization for MinGW on Linux 2017-01-25 20:42:26 +01:00
Davide Beatrici
28b9b1d372
WASAPI.h: Change header name capitalization for MinGW on Linux
This fixes a problem with MinGW on Linux where it can't find "Audiopolicy.h".
2017-01-25 18:49:20 +01:00
Davide Beatrici
a4b1f8a725
rcc.pri: Fix script path for MinGW on Linux
This fixes a problem with MinGW on Linux where it can't find the script file, because of the backslashes.
Windows handles the path correctly with both methods.
2017-01-25 17:49:39 +01:00
Mikkel Krautz
cda06e9434 Merge PR #2770: mumble_pch.hpp: Change header name capitalization for MinGW on Linux 2017-01-25 16:35:16 +01:00
Davide Beatrici
7b31e4fe5b
mumble_pch.hpp: Change header name capitalization for MinGW on Linux
This fixes a problem with MinGW on Linux where it can't find "Softpub.h" and "Dbt.h".
2017-01-25 15:23:40 +01:00
Mikkel Krautz
c3e290552d Merge PR #2753: Murmur: set detach=false for -limits (implies -fg). 2017-01-24 20:47:20 +01:00
Mikkel Krautz
460f550287 Merge PR #2744: Revert PR 2674 and document audio backend initialization and teardown 2017-01-24 20:46:53 +01:00
Mikkel Krautz
50be180392 Merge PR #2767: Transifex translation update 2017-01-24 00:30:11 +01:00
Mikkel Krautz
3e777babe8 Merge PR #2768: mumble.pro: use forward slash for GENQRC also on Windows 2017-01-24 00:27:16 +01:00
Mikkel Krautz
f542989921 Merge PR #2769: Use forward slash for paths in .rc files 2017-01-24 00:26:31 +01:00
Davide Beatrici
1ba426957d
Use forward slash for paths in .rc files
This fixes a problem with MinGW on Linux where it can't find the icon file, because of the backslashes.
Windows handles the path correctly with both methods.
2017-01-23 20:34:34 +01:00
Davide Beatrici
3bc58e8f62
mumble.pro: use forward slash for GENQRC also on Windows
This fixes a problem with MinGW on Linux where the "win32" block is triggered and the two backslashes are used, resulting in a path without slashes.
Python on Windows handles the path correctly with both methods.
2017-01-23 19:53:53 +01:00
MumbleTransifexBot
7455a007af Transifex translation update
Mode: default
Minimum percent translated: 0
Matched 41 languages
2017-01-23 01:27:37 +00:00
Mikkel Krautz
c2f6865dd7 Merge PR #2764: python.pri: Correct typo "unble" to "unable" 2017-01-22 23:32:39 +01:00
Davide Beatrici
63280fc764
python.pri: Correct typo "unble" to "unable" 2017-01-22 23:20:38 +01:00
Mikkel Krautz
b5aef4ca80 Merge PR #2762: MainWindow: don't include 'Hide Mumble' menu item on macOS. 2017-01-22 22:45:21 +01:00
Mikkel Krautz
32030edb4a MainWindow: don't include 'Hide Mumble' menu item on macOS.
It is unnecessary (the system has window-hiding built-in) and
can get us in a state where the window can't be shown again.

Easier just to leave it out.
2017-01-22 22:44:25 +01:00
Mikkel Krautz
bf90fadd91 Merge PR #2747: Allow hiding Muble from the menu without minimizing 2017-01-22 22:39:30 +01:00
Mikkel Krautz
348d45707a Merge PR #2761: main.pro: don't build minhook if "no-overlay" option specified 2017-01-22 22:37:24 +01:00
Davide Beatrici
f1ba1df6b8
main.pro: don't build minhook if "no-overlay" option specified
We use minhook only for the overlay. Therefore, If the option "no-overlay" is present, we shouldn't build it.
2017-01-22 22:26:01 +01:00
Mikkel Krautz
44790f6f66 murmur.pro: remove Mumble buildenv requirement for QSslDiffieHellmanParameters.
The API of QSslDiffieHellmanParameters is frozen and will be available
in Qt 5.8.0.

Remove the safety-net of only allowing QSslDiffieHellmanParameters for
Mumble build environments.
2017-01-22 22:07:25 +01:00
Mikkel Krautz
645603771d Murmur: use final Qt 5.8 API for QSslDiffieHellmanParameters. 2017-01-22 22:05:52 +01:00
Mikkel Krautz
a08c509de6 Merge PR #2759: main.pro: fix-ups for "no-overlay" CONFIG option on Windows 2017-01-22 22:05:12 +01:00
Davide Beatrici
920244c1b8
main.pro: fix no-overlay to actually work on Windows 2017-01-22 21:59:51 +01:00
Davide Beatrici
fda85f4331
main.pro: ensure we don't build overlay_gl on Windows. 2017-01-22 21:57:41 +01:00
Davide Beatrici
e42e6ca984
Make "no-overlay" option available also for Windows
The option currently works only on Linux, since there was no need in Windows, until now.
During a MinGW build test we noticed that minhook can be compiled only with MSVC, for various macros and probably other things.
2017-01-22 21:32:27 +01:00
Mikkel Krautz
98349a1b33 Merge PR #2755: plugins: Fix visibility, warnings and errors when compiled with MinGW 2017-01-22 16:37:32 +01:00
Davide Beatrici
6096b74a1c
plugins: Fix MinGW compilation warnings and errors
warning: converting to non-pointer type 'procptr32_t {aka long unsigned int}' from NULL [-Wconversion-null]
ql\ql.cpp:87: warning: comparison is always true due to limited range of data type [-Wtype-limits]
sto\sto.cpp:11: error: 'numeric_limits' is not a member of 'std'

Not fixed:
sto\sto.cpp:55: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
2017-01-22 16:20:56 +01:00
Davide Beatrici
e92b27b8ca
plugins: Fix visibility for plugins compiled with MinGW 2017-01-22 16:19:58 +01:00
Mikkel Krautz
0e898da3f2 Murmur: set detach=false for -limits (implies -fg).
Without this, we delay the log messages from -limits
until we exit with a qFatal.

This isn't good, because -limits *can* fail in ways that
cause it to get stuck. One example of this is when Murmur
runs out of memory. This typically happens on 32-bit systems
during the test that counts the number of threads Murmur can
spawn, given the system's resource limits.

One such instance is if we reach the virtual memory limit on
i386. Then, QThread::start() will try to call pthread_create(),
which fails with EACCESS. (Insufficient resources, system-imposed
or otherwise). Qt doesn't handle this error situation, but
instead calls qWarning to make the user aware.

Without this change, we would never present this warning to
the user, because Murmur would be stuck.

With this change, the user can at least see the warning, to
know something has gone wrong.

Fixes mumble-voip/mumble#2752
2017-01-22 11:09:21 +01:00
Mikkel Krautz
12b9c9b984 Merge PR #2749: python.pri: detect missing 'which' command and try to recover. 2017-01-22 09:49:00 +01:00
Mikkel Krautz
0c14aae6db python.pri: detect missing 'which' command and try to recover.
Previously, the python.pri helper would try to query which python
binary on the system to use via the 'which' command.

Some systems do not have which (some Docker-based CI systems,
for example).

We now detect the presence of 'which'. If it is not available,
we try to use 'python' as the Python command. We also print a
warning about 'which' not being available -- as well as a message
pointing users to the MUMBLE_PYTHON environment variable.

Fixes mumble-voip/mumble#2748
2017-01-22 09:45:55 +01:00
Mikkel Krautz
63661c0116 Merge PR #2746: Remove long-form BSD-license from GKey.cpp/.h. 2017-01-21 20:12:38 +01:00
Piratonym
74572fd66e Allow hiding Muble from the menu without minimizing 2017-01-21 09:49:59 +01:00