|
 |
c35704a |
diff -rupN --no-dereference qttools-everywhere-src-5.15.2/src/linguist/lprodump/main.cpp qttools-everywhere-src-5.15.2-new/src/linguist/lprodump/main.cpp
|
|
|
c35704a |
--- qttools-everywhere-src-5.15.2/src/linguist/lprodump/main.cpp 2020-10-22 19:11:38.000000000 +0200
|
|
|
c35704a |
+++ qttools-everywhere-src-5.15.2-new/src/linguist/lprodump/main.cpp 2020-11-23 18:38:02.331245561 +0100
|
|
|
68a9fb4 |
@@ -438,7 +438,7 @@ int main(int argc, char **argv)
|
|
|
68a9fb4 |
ProFileGlobals option;
|
|
|
68a9fb4 |
option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
|
|
|
68a9fb4 |
if (option.qmake_abslocation.isEmpty())
|
|
|
68a9fb4 |
- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
|
|
|
68a9fb4 |
+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5");
|
|
|
68a9fb4 |
option.debugLevel = proDebug;
|
|
|
68a9fb4 |
option.initProperties();
|
|
|
68a9fb4 |
option.setCommandLineArguments(QDir::currentPath(),
|
|
|
c35704a |
diff -rupN --no-dereference qttools-everywhere-src-5.15.2/src/linguist/lrelease-pro/main.cpp qttools-everywhere-src-5.15.2-new/src/linguist/lrelease-pro/main.cpp
|
|
|
c35704a |
--- qttools-everywhere-src-5.15.2/src/linguist/lrelease-pro/main.cpp 2020-10-22 19:11:38.000000000 +0200
|
|
|
c35704a |
+++ qttools-everywhere-src-5.15.2-new/src/linguist/lrelease-pro/main.cpp 2020-11-23 18:38:02.331245561 +0100
|
|
|
68a9fb4 |
@@ -145,6 +145,6 @@ int main(int argc, char **argv)
|
|
|
68a9fb4 |
projectDescription->setAutoRemove(false);
|
|
|
68a9fb4 |
lreleaseOptions << QStringLiteral("-project") << projectDescription->fileName();
|
|
|
68a9fb4 |
|
|
|
68a9fb4 |
- runQtTool(QStringLiteral("lrelease"), lreleaseOptions);
|
|
|
68a9fb4 |
+ runQtTool(QStringLiteral("lrelease-qt5"), lreleaseOptions);
|
|
|
68a9fb4 |
return 0;
|
|
|
68a9fb4 |
}
|
|
|
c35704a |
diff -rupN --no-dereference qttools-everywhere-src-5.15.2/src/linguist/lupdate-pro/main.cpp qttools-everywhere-src-5.15.2-new/src/linguist/lupdate-pro/main.cpp
|
|
|
c35704a |
--- qttools-everywhere-src-5.15.2/src/linguist/lupdate-pro/main.cpp 2020-10-22 19:11:38.000000000 +0200
|
|
|
c35704a |
+++ qttools-everywhere-src-5.15.2-new/src/linguist/lupdate-pro/main.cpp 2020-11-23 18:38:02.331245561 +0100
|
|
|
68a9fb4 |
@@ -154,6 +154,6 @@ int main(int argc, char **argv)
|
|
|
68a9fb4 |
projectDescription->setAutoRemove(false);
|
|
|
68a9fb4 |
lupdateOptions << QStringLiteral("-project") << projectDescription->fileName();
|
|
|
68a9fb4 |
|
|
|
68a9fb4 |
- runQtTool(QStringLiteral("lupdate"), lupdateOptions);
|
|
|
68a9fb4 |
+ runQtTool(QStringLiteral("lupdate-qt5"), lupdateOptions);
|
|
|
68a9fb4 |
return 0;
|
|
|
68a9fb4 |
}
|
|
|
c35704a |
diff -rupN --no-dereference qttools-everywhere-src-5.15.2/src/linguist/shared/runqttool.cpp qttools-everywhere-src-5.15.2-new/src/linguist/shared/runqttool.cpp
|
|
|
c35704a |
--- qttools-everywhere-src-5.15.2/src/linguist/shared/runqttool.cpp 2020-10-22 19:11:38.000000000 +0200
|
|
|
c35704a |
+++ qttools-everywhere-src-5.15.2-new/src/linguist/shared/runqttool.cpp 2020-11-23 18:38:02.331245561 +0100
|
|
|
68a9fb4 |
@@ -114,6 +114,6 @@ std::unique_ptr<QTemporaryFile> createPr
|
|
|
68a9fb4 |
}
|
|
|
68a9fb4 |
file->close();
|
|
|
68a9fb4 |
args << QStringLiteral("-out") << file->fileName();
|
|
|
68a9fb4 |
- runQtTool(QStringLiteral("lprodump"), args);
|
|
|
68a9fb4 |
+ runQtTool(QStringLiteral("lprodump-qt5"), args);
|
|
|
68a9fb4 |
return file;
|
|
|
68a9fb4 |
}
|