hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-08 19:21:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

returned the fake -style=0 arg for QApplication, currently it must not load gtk library itself, see https://github.com/telegramdesktop/tdesktop/issues/1774

Browse source
This commit is contained in:
John Preston 2016-03-15 21:29:20 +03:00
parent 98b0ebcce6
commit c6437ce893
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Telegram/SourceFiles/main.cpp
View file

@ -38,14 +38,21 @@ int main(int argc, char *argv[]) {
Logs::start(); // must be started before PlatformSpecific is started Logs::start(); // must be started before PlatformSpecific is started
PlatformSpecific::start(); // must be started before QApplication is created PlatformSpecific::start(); // must be started before QApplication is created
//QByteArray args[] = { "-style=0" }; // prepare fake args to disable QT_STYLE_OVERRIDE env variable // prepare fake args to disable QT_STYLE_OVERRIDE env variable
//static const int a_cnt = sizeof(args) / sizeof(args[0]); // currently this is required in some desktop environments, including Xubuntu 15.10
//int a_argc = a_cnt + 1; // when we don't default style to "none" Qt dynamically loads GTK somehow internally and
//char *a_argv[a_cnt + 1] = { argv[0], args[0].data() }; // our own GTK dynamic load and usage leads GTK errors and freeze of the current main thread
// we can't disable our own GTK loading because it is required by libappindicator, which
// provides the tray icon for this system, because Qt tray icon is broken there
// see https://github.com/telegramdesktop/tdesktop/issues/1774
QByteArray args[] = { "-style=0" };
static const int a_cnt = sizeof(args) / sizeof(args[0]);
int a_argc = a_cnt + 1;
char *a_argv[a_cnt + 1] = { argv[0], args[0].data() };
int result = 0; int result = 0;
{ {
Application app(argc, argv); Application app(a_argc, a_argv);
result = app.exec(); result = app.exec();
} }