mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
1f96216844
* update upstream version to 3.25.0.0 * fix the application desktop file to use the right binary name * make building more robust when qt version changes, automatically try to copy qtscriptgenerator directory
49 lines
1.2 KiB
Diff
49 lines
1.2 KiB
Diff
diff --git a/src/core/RS.cpp b/src/core/RS.cpp
|
|
index d8a135d6f..659795dbb 100644
|
|
--- a/src/core/RS.cpp
|
|
+++ b/src/core/RS.cpp
|
|
@@ -151,7 +151,7 @@ QStringList RS::getDirectoryList(const QString& subDirectory) {
|
|
dirList.append(appDir + "/../../../" + subDirectory);
|
|
dirList.append(QDir::currentPath() + "/" + subDirectory);
|
|
#else
|
|
- dirList.append(appDir + "/" + subDirectory);
|
|
+ dirList.append(appDir + "/../lib/" + subDirectory);
|
|
#endif
|
|
|
|
/*
|
|
diff --git a/src/core/RSettings.cpp b/src/core/RSettings.cpp
|
|
index c6c31cbf5..c51b59ce6 100644
|
|
--- a/src/core/RSettings.cpp
|
|
+++ b/src/core/RSettings.cpp
|
|
@@ -367,6 +367,8 @@ QString RSettings::getApplicationPath() {
|
|
ret.cdUp();
|
|
}
|
|
|
|
+ ret.cd("../lib");
|
|
+
|
|
return ret.path();
|
|
}
|
|
|
|
@@ -1268,7 +1270,7 @@ QString RSettings::getRevisionString() {
|
|
}
|
|
|
|
QString RSettings::getReleaseDate() {
|
|
- return __DATE__;
|
|
+ return "";
|
|
}
|
|
|
|
int RSettings::getSnapRange() {
|
|
diff --git a/qcad.desktop b/qcad.desktop
|
|
index 93c5e9720..2d0e6bf32 100644
|
|
--- a/qcad.desktop
|
|
+++ b/qcad.desktop
|
|
@@ -48,7 +48,7 @@ Comment[sv]=2D CAD-system
|
|
Comment[sl]=Sistem 2D CAD
|
|
Comment[uk]=2D САПР
|
|
Comment[tr]=2D CAD Sistemi
|
|
-Exec=qcad %F
|
|
+Exec=qcad-bin %F
|
|
X-MultipleArgs=true
|
|
Icon=qcad_icon
|
|
Terminal=false
|