7 files changed, 82 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs
new file mode 100644
index 000000000..60c3d304f
--- /dev/null
+++ b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs
@@ -0,0 +1,25 @@
+import qbs 1.0
+
+Project {
+    CppApplication {
+        name: "main"
+        install: true
+        files: [
+            "main.cpp",
+            "myapp.desktop",
+            "myapp.appdata.xml",
+        ]
+
+        Depends { name: "freedesktop" }
+
+        freedesktop.name: "My App"
+        freedesktop.desktopKeys: ({
+            'Icon': "myapp.png"
+        })
+
+        Group {
+            files: "myapp.png"
+            fileTags: "freedesktop.appIcon"
+        }
+    }
+}
diff --git a/tests/auto/blackbox/testdata/freedesktop/main.cpp b/tests/auto/blackbox/testdata/freedesktop/main.cpp
new file mode 100644
index 000000000..905869dfa
--- /dev/null
+++ b/tests/auto/blackbox/testdata/freedesktop/main.cpp
@@ -0,0 +1,4 @@
+int main()
+{
+    return 0;
+}
diff --git a/tests/auto/blackbox/testdata/freedesktop/myapp.appdata.xml b/tests/auto/blackbox/testdata/freedesktop/myapp.appdata.xml
new file mode 100644
index 000000000..3cf0a5641
--- /dev/null
+++ b/tests/auto/blackbox/testdata/freedesktop/myapp.appdata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>myapp.desktop</id>
+  <metadata_license>CC0</metadata_license>
+  <name>MyApp</name>
+  <summary>The coolest app ever</summary>
+
+  <description>
+    <p>This is a cool application.</p>
+  </description>
+
+  <url type="homepage">https://software.house/myapp</url>
+  <project_license>GPL-2.0+</project_license>
+  <developer_name>Coding Wizard</developer_name>
+</component>
diff --git a/tests/auto/blackbox/testdata/freedesktop/myapp.desktop b/tests/auto/blackbox/testdata/freedesktop/myapp.desktop
new file mode 100644
index 000000000..dac3014c3
--- /dev/null
+++ b/tests/auto/blackbox/testdata/freedesktop/myapp.desktop
@@ -0,0 +1,4 @@
+[Desktop Entry]
+GenericName=Image Editor
+Comment=Create images and edit photographs
+Icon=overridden.png
diff --git a/tests/auto/blackbox/testdata/freedesktop/myapp.png b/tests/auto/blackbox/testdata/freedesktop/myapp.png
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/auto/blackbox/testdata/freedesktop/myapp.png
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 66b4f8675..876d6239e 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -3771,6 +3771,39 @@ void TestBlackbox::fileTagsFilterMerging()
     QVERIFY2(QFile::exists(otherOutput), qPrintable(otherOutput));
 }
 
+void TestBlackbox::freedesktop()
+{
+    if (!HostOsInfo::isAnyUnixHost() || HostOsInfo::isMacosHost())
+        QSKIP("only applies on Unix");
+
+    QDir::setCurrent(testDataDir + "/freedesktop");
+    QCOMPARE(runQbs(), 0);
+
+    // Check desktop file
+    QString desktopFilePath =
+        defaultInstallRoot + "/usr/local/share/applications/myapp.desktop";
+    QVERIFY(QFile::exists(desktopFilePath));
+    QFile desktopFile(desktopFilePath);
+    QVERIFY2(desktopFile.open(QIODevice::ReadOnly), qPrintable(desktopFile.errorString()));
+    QByteArrayList lines = desktopFile.readAll().split('\n');
+    // Automatically filled line:
+    QVERIFY(lines.contains("Exec=main"));
+    // Name specified in `freedesktop.name` property
+    QVERIFY(lines.contains("Name=My App"));
+    // Overridden line:
+    QVERIFY(lines.contains("Icon=myapp.png"));
+    // Untouched line:
+    QVERIFY(lines.contains("Terminal=false"));
+
+    // Check AppStream file
+    QVERIFY(QFile::exists(defaultInstallRoot +
+                          "/usr/local/share/metainfo/myapp.appdata.xml"));
+
+    // Check icon file
+    QVERIFY(QFile::exists(defaultInstallRoot +
+                          "/usr/local/share/icons/hicolor/scalable/apps/myapp.png"));
+}
+
 void TestBlackbox::installedTransformerOutput()
 {
     QDir::setCurrent(testDataDir + "/installed-transformer-output");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index f9a3d5c7c..eb9e06dd6 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -117,6 +117,7 @@ private slots:
     void externalLibs();
     void fileDependencies();
     void fileTagsFilterMerging();
+    void freedesktop();
     void generatedArtifactAsInputToDynamicRule();
     void generateLinkerMapFile();
     void generator();