Skip to content

Commit

Permalink
Fixed icon for tiled.exe
Browse files Browse the repository at this point in the history
Fixing the path as in 358b6a2 was not enough, because
the icon had already broken in 16229d0.

It appears the texttemplate module properties were ineffective in the
Group item, but it failed to generate an error.
  • Loading branch information
bjorn committed Apr 5, 2023
1 parent 358b6a2 commit 3b2a3c4
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions src/tiledapp/tiledapp.qbs
Expand Up @@ -11,7 +11,7 @@ TiledQtGuiApplication {
Depends { name: "libtilededitor" }
Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
Depends { name: "Qt.gui-private"; condition: qbs.targetOS.contains("windows") && Qt.core.versionMajor >= 6 }
Depends { name: "texttemplate" }
Depends { name: "texttemplate"; condition: qbs.targetOS.contains("windows") }

property bool qtcRunnable: true

Expand Down Expand Up @@ -47,6 +47,22 @@ TiledQtGuiApplication {
targetName: "Tiled"
}

Properties {
condition: qbs.targetOS.contains("windows")

texttemplate.outputTag: "rc"
texttemplate.dict: {
var versionArray = project.version.split(".");
if (versionArray.length == 3)
versionArray.push("0");

return {
version: project.version,
version_csv: versionArray.join(",")
};
}
}

Group {
condition: qbs.targetOS.contains("macos")
name: "Public DSA Key File"
Expand Down Expand Up @@ -175,17 +191,5 @@ TiledQtGuiApplication {
name: "RC file (Windows)"
condition: qbs.targetOS.contains("windows")
files: [ "tiled.rc.in" ]

texttemplate.outputTag: "rc"
texttemplate.dict: {
var versionArray = project.version.split(".");
if (versionArray.length == 3)
versionArray.push("0");

return {
version: project.version,
version_csv: versionArray.join(",")
};
}
}
}

0 comments on commit 3b2a3c4

Please sign in to comment.