Merge pull request #68893 from sikmir/qt5ct

qt5ct: 0.39 -> 0.41
This commit is contained in:
worldofpeace 2019-09-17 13:04:33 -04:00 committed by GitHub
commit fef262cd92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 29 deletions

View file

@ -4,22 +4,17 @@ let inherit (lib) getDev; in
mkDerivation rec {
pname = "qt5ct";
version = "0.39";
version = "0.41";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "069y6c17gfics8rz3rdsn2x2hb39m4qka08ygwpxa8gqppffqs9p";
sha256 = "1p2p6116wg5bc0hcbi2sygwlgk0g9idxpci0qdh3p4lb1plk0h7j";
};
nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtbase ];
# Wayland needs to know the desktop file name in order to show the app name and icon.
# Patch has been upstreamed and can be removed in the future.
# See: https://sourceforge.net/p/qt5ct/code/549/
patches = [ ./wayland.patch ];
qmakeFlags = [
"LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
];

View file

@ -1,22 +0,0 @@
--- a/src/qt5ct/main.cpp
+++ b/src/qt5ct/main.cpp
@@ -29,14 +29,18 @@
#include <QApplication>
#include <QLibraryInfo>
#include <QLocale>
-#include "qt5ct.h"
+#include <QtGlobal>
#include <QTranslator>
#include <QtDebug>
+#include "qt5ct.h"
#include "mainwindow.h"
int main(int argc, char **argv)
{
QApplication app(argc, argv);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
+ QGuiApplication::setDesktopFileName("qt5ct.desktop");
+#endif
QTranslator translator;
QString locale = Qt5CT::systemLanguageID();
translator.load(QString(":/qt5ct_") + locale);