Skip to content

Commit 54d9887

Browse files
committed
Remove experimental Gtk+ platform themes deployment
This has started to cause issues on a large variety of distributions. Closes #109.
1 parent 16bc5dd commit 54d9887

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

src/deployers/PlatformPluginsDeployer.cpp

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,11 @@ bool PlatformPluginsDeployer::deploy() {
5151
if (!appDir.deployLibrary(*i, stylesDestination))
5252
return false;
5353
} else {
54-
ldLog() << "Trying to deploy Gtk 2 platform theme and/or style" << std::endl;
55-
56-
// according to probono, only the files shall be deployed, not their dependencies
57-
// either loading succeeds, then the system Gtk shall be used anyway, otherwise loading fails and Qt will fall
58-
// back to the default UI theme
59-
// we don't care whether this works (it's an experimental feature), therefore we ignore the return values
60-
const auto libqgtk2Path = platformThemesPath / "libqgtk2.so";
61-
const auto libqgtk3Path = platformThemesPath / "libqgtk3.so";
54+
ldLog() << "Trying to deploy platform themes and style" << std::endl;
55+
6256
const auto libqxdgPath = platformThemesPath / "libqxdgdesktopportal.so";
6357

64-
for (const auto &file : {libqgtk2Path, libqgtk3Path, libqxdgPath}) {
58+
for (const auto &file : {libqxdgPath}) {
6559
// we need to check whether the files exist at least, otherwise the deferred deployment operation fails
6660
if (bf::is_regular_file(file)) {
6761
ldLog() << "Attempting to deploy" << file.filename() << "found at path" << file.parent_path() << std::endl;
@@ -70,14 +64,6 @@ bool PlatformPluginsDeployer::deploy() {
7064
ldLog() << "Could not find" << file.filename() << "on system, skipping deployment" << std::endl;
7165
}
7266
}
73-
74-
const auto libqgtk2stylePath = stylesPath / "libqgtk2style.so";
75-
if (bf::is_regular_file(libqgtk2stylePath)) {
76-
ldLog() << "Attempting to deploy" << libqgtk2stylePath.filename() << "found at path" << libqgtk2stylePath << std::endl;
77-
appDir.deployFile(libqgtk2stylePath, stylesDestination);
78-
} else {
79-
ldLog() << "Could not find" << libqgtk2stylePath.filename() << "on system, skipping deployment" << std::endl;
80-
}
8167
}
8268

8369
return true;

0 commit comments

Comments
 (0)