aboutsummaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'src/app')
-rw-r--r--src/app/app-Info.plist10
-rw-r--r--src/app/app.pro36
-rw-r--r--src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.pngbin5698 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.pngbin12248 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.pngbin1278 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.pngbin12281 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.pngbin27940 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.pngbin1302 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.pngbin2658 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.pngbin27970 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.pngbin64627 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/profile.iconset/icon_16x16.pngbin527 -> 0 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128.png (renamed from src/app/qtcreator.xcassets/profile.iconset/icon_128x128.png)bin5928 -> 5928 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128@2x.png (renamed from src/app/qtcreator.xcassets/profile.iconset/icon_128x128@2x.png)bin12709 -> 12709 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16.png (renamed from src/app/qtcreator.xcassets/prifile.iconset/icon_16x16.png)bin527 -> 527 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16@2x.png (renamed from src/app/qtcreator.xcassets/profile.iconset/icon_16x16@2x.png)bin1348 -> 1348 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256.png (renamed from src/app/qtcreator.xcassets/profile.iconset/icon_256x256.png)bin12740 -> 12740 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256@2x.png (renamed from src/app/qtcreator.xcassets/profile.iconset/icon_256x256@2x.png)bin29292 -> 29292 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32.png (renamed from src/app/qtcreator.xcassets/profile.iconset/icon_32x32.png)bin1332 -> 1332 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32@2x.png (renamed from src/app/qtcreator.xcassets/profile.iconset/icon_32x32@2x.png)bin2772 -> 2772 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512.png (renamed from src/app/qtcreator.xcassets/profile.iconset/icon_512x512.png)bin29340 -> 29340 bytes
-rw-r--r--src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512@2x.png (renamed from src/app/qtcreator.xcassets/profile.iconset/icon_512x512@2x.png)bin67721 -> 67721 bytes
22 files changed, 11 insertions, 35 deletions
diff --git a/src/app/app-Info.plist b/src/app/app-Info.plist
index c2f2ce95f5..5893f062a8 100644
--- a/src/app/app-Info.plist
+++ b/src/app/app-Info.plist
@@ -6,7 +6,7 @@
<array>
<dict>
<key>UTTypeIconFile</key>
- <string>profile.icns</string>
+ <string>qtcreator-project.icns</string>
<key>UTTypeDescription</key>
<string>Qt Creator Makefile Based Project File</string>
<key>UTTypeConformsTo</key>
@@ -25,7 +25,7 @@
</dict>
<dict>
<key>UTTypeIconFile</key>
- <string>profile.icns</string>
+ <string>qtcreator-project.icns</string>
<key>UTTypeDescription</key>
<string>Quick Project File</string>
<key>UTTypeConformsTo</key>
@@ -48,7 +48,7 @@
<array>
<dict>
<key>UTTypeIconFile</key>
- <string>profile.icns</string>
+ <string>qtcreator-project.icns</string>
<key>UTTypeDescription</key>
<string>Qt Project File</string>
<key>UTTypeConformsTo</key>
@@ -67,7 +67,7 @@
</dict>
<dict>
<key>UTTypeIconFile</key>
- <string>prifile.icns</string>
+ <string>qtcreator-project.icns</string>
<key>UTTypeDescription</key>
<string>Qt Project Include File</string>
<key>UTTypeConformsTo</key>
@@ -87,7 +87,7 @@
</dict>
<dict>
<key>UTTypeIconFile</key>
- <string>profile.icns</string>
+ <string>qtcreator-project.icns</string>
<key>UTTypeDescription</key>
<string>Qbs Project File</string>
<key>UTTypeConformsTo</key>
diff --git a/src/app/app.pro b/src/app/app.pro
index a64c357020..89b9554a9f 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -28,36 +28,10 @@ win32 {
RC_FILE = qtcreator.rc
} else:macx {
LIBS += -framework CoreFoundation
- minQtVersion(5, 7, 1) {
- QMAKE_ASSET_CATALOGS = $$PWD/qtcreator.xcassets
- QMAKE_ASSET_CATALOGS_BUILD_PATH = $$IDE_DATA_PATH
- QMAKE_ASSET_CATALOGS_INSTALL_PATH = $$INSTALL_DATA_PATH
- QMAKE_ASSET_CATALOGS_APP_ICON = qtcreator
- } else {
- ASSETCATALOG.files = $$PWD/qtcreator.xcassets
- macx-xcode {
- QMAKE_BUNDLE_DATA += ASSETCATALOG
- } else {
- ASSETCATALOG.output = $$IDE_DATA_PATH/qtcreator.icns
- ASSETCATALOG.commands = xcrun actool \
- --app-icon qtcreator \
- --output-partial-info-plist $$shell_quote($(TMPDIR)/qtcreator.Info.plist) \
- --platform macosx \
- --minimum-deployment-target $$QMAKE_MACOSX_DEPLOYMENT_TARGET \
- --compile $$shell_quote($$IDE_DATA_PATH) \
- $$shell_quote($$PWD/qtcreator.xcassets) > /dev/null
- ASSETCATALOG.input = ASSETCATALOG.files
- ASSETCATALOG.CONFIG += no_link target_predeps
- QMAKE_EXTRA_COMPILERS += ASSETCATALOG
- icns.files = \
- $$IDE_DATA_PATH/qtcreator.icns \
- $$IDE_DATA_PATH/prifile.icns \
- $$IDE_DATA_PATH/profile.icns
- icns.path = $$INSTALL_DATA_PATH
- icns.CONFIG += no_check_exist
- INSTALLS += icns
- }
- }
+ QMAKE_ASSET_CATALOGS = $$PWD/qtcreator.xcassets
+ QMAKE_ASSET_CATALOGS_BUILD_PATH = $$IDE_DATA_PATH
+ QMAKE_ASSET_CATALOGS_INSTALL_PATH = $$INSTALL_DATA_PATH
+ QMAKE_ASSET_CATALOGS_APP_ICON = qtcreator
infoplist = $$cat($$PWD/app-Info.plist, blob)
infoplist = $$replace(infoplist, @MACOSX_DEPLOYMENT_TARGET@, $$QMAKE_MACOSX_DEPLOYMENT_TARGET)
@@ -78,3 +52,5 @@ DISTFILES += qtcreator.rc \
QMAKE_SUBSTITUTES += $$PWD/app_version.h.in
CONFIG += no_batch
+
+QMAKE_EXTRA_TARGETS += deployqt # dummy
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.png
deleted file mode 100644
index 4292783e82..0000000000
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.png
deleted file mode 100644
index cfbea56ab2..0000000000
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.png
deleted file mode 100644
index dc706b6ffb..0000000000
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.png
deleted file mode 100644
index 1420511d6b..0000000000
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.png
deleted file mode 100644
index e45fc3650d..0000000000
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.png
deleted file mode 100644
index cb7c0e6214..0000000000
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.png
deleted file mode 100644
index 21aa63cd03..0000000000
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.png
deleted file mode 100644
index c9b64b3e81..0000000000
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.png
deleted file mode 100644
index 39b0ab7489..0000000000
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_16x16.png b/src/app/qtcreator.xcassets/profile.iconset/icon_16x16.png
deleted file mode 100644
index e6d3674071..0000000000
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_16x16.png
+++ /dev/null
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_128x128.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128.png
index 9fb0b850ed..9fb0b850ed 100644
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_128x128.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128.png
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128@2x.png
index 48923af95a..48923af95a 100644
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_128x128@2x.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128@2x.png
Binary files differ
diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16.png
index e6d3674071..e6d3674071 100644
--- a/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16.png
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16@2x.png
index bd9d250839..bd9d250839 100644
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_16x16@2x.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16@2x.png
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_256x256.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256.png
index 4956ea009a..4956ea009a 100644
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_256x256.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256.png
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256@2x.png
index 218534a85e..218534a85e 100644
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_256x256@2x.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256@2x.png
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_32x32.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32.png
index 9cac26d704..9cac26d704 100644
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_32x32.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32.png
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32@2x.png
index b5f4bc827f..b5f4bc827f 100644
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_32x32@2x.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32@2x.png
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_512x512.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512.png
index a9ef0f4a74..a9ef0f4a74 100644
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_512x512.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512.png
Binary files differ
diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512@2x.png
index dedd2f5e57..dedd2f5e57 100644
--- a/src/app/qtcreator.xcassets/profile.iconset/icon_512x512@2x.png
+++ b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512@2x.png
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 18:32:09 +0000