瀏覽代碼

Merge branch 'master' of https://github.com/N3Roaster/typica into development

Conflicts:
	src/Typica.pro
Neal Wilson 11 年之前
父節點
當前提交
db7b3dbf0d
共有 3 個檔案被更改,包括 83 行新增30 行删除
  1. 26
    0
      src/Info.plist
  2. 31
    30
      src/Typica.pro
  3. 26
    0
      src/resources/Info.plist

+ 26
- 0
src/Info.plist 查看文件

@@ -0,0 +1,26 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
3
+<plist version="0.9">
4
+<dict>
5
+	<key>CFBundleIconFile</key>
6
+	<string>logo.icns</string>
7
+	<key>CFBundlePackageType</key>
8
+	<string>APPL</string>
9
+	<key>CFBundleGetInfoString</key>
10
+	<string>Typica 1.4.3</string>
11
+	<key>CFBundleSignature</key>
12
+	<string>????</string>
13
+	<key>CFBundleExecutable</key>
14
+	<string>Typica</string>
15
+	<key>CFBundleIdentifier</key>
16
+	<string>com.wilsonscoffee.Typica</string>
17
+	<key>CFBundleDisplayName</key>
18
+	<string>Typica</string>
19
+	<key>CFBundleShortVersionString</key>
20
+	<string>1.4.3</string>
21
+	<key>CFBundleVersion</key>
22
+	<string>1.4.3</string>
23
+	<key>NSHumanReadableCopyright</key>
24
+	<string>© 2007–2013 Neal Wilson</string>
25
+</dict>
26
+</plist>

+ 31
- 30
src/Typica.pro 查看文件

@@ -1,30 +1,31 @@
1
-######################################################################
2
-# Automatically generated by qmake (2.01a) Sat May 23 23:41:13 2009
3
-######################################################################
4
-
5
-QT += script
6
-QT += xml
7
-QT += sql
8
-QT += xmlpatterns
9
-QT += scripttools
10
-QT += webkit
11
-
12
-include(3rdparty/qextserialport/src/qextserialport.pri)
13
-
14
-TEMPLATE = app
15
-TARGET = 
16
-DEPENDPATH += .
17
-
18
-# Input
19
-HEADERS += moc_typica.cpp \
20
-    helpmenu.h \
21
-    abouttypica.h
22
-SOURCES += typica.cpp \
23
-    helpmenu.cpp \
24
-    abouttypica.cpp
25
-
26
-RESOURCES += \
27
-    resources.qrc
28
-
29
-RC_FILE = typica.rc
30
-ICON = resources/icons/appicons/logo.icns
1
+######################################################################
2
+# Automatically generated by qmake (2.01a) Sat May 23 23:41:13 2009
3
+######################################################################
4
+
5
+QT += script
6
+QT += xml
7
+QT += sql
8
+QT += xmlpatterns
9
+QT += scripttools
10
+QT += webkit
11
+
12
+include(3rdparty/qextserialport/src/qextserialport.pri)
13
+
14
+TEMPLATE = app
15
+TARGET =
16
+DEPENDPATH += .
17
+
18
+# Input
19
+HEADERS += moc_typica.cpp \
20
+    helpmenu.h \
21
+    abouttypica.h
22
+SOURCES += typica.cpp \
23
+    helpmenu.cpp \
24
+    abouttypica.cpp
25
+
26
+RESOURCES += \
27
+    resources.qrc
28
+
29
+RC_FILE = typica.rc
30
+ICON = resources/icons/appicons/logo.icns
31
+QMAKE_INFO_PLIST = resources/Info.plist

+ 26
- 0
src/resources/Info.plist 查看文件

@@ -0,0 +1,26 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
3
+<plist version="0.9">
4
+<dict>
5
+	<key>CFBundleIconFile</key>
6
+	<string>@ICON@</string>
7
+	<key>CFBundlePackageType</key>
8
+	<string>APPL</string>
9
+	<key>CFBundleGetInfoString</key>
10
+	<string>Typica 1.4.3</string>
11
+	<key>CFBundleSignature</key>
12
+	<string>@TYPEINFO@</string>
13
+	<key>CFBundleExecutable</key>
14
+	<string>@EXECUTABLE@</string>
15
+	<key>CFBundleIdentifier</key>
16
+	<string>com.wilsonscoffee.@EXECUTABLE@</string>
17
+	<key>CFBundleDisplayName</key>
18
+	<string>Typica</string>
19
+	<key>CFBundleShortVersionString</key>
20
+	<string>1.4.3</string>
21
+	<key>CFBundleVersion</key>
22
+	<string>1.4.3</string>
23
+	<key>NSHumanReadableCopyright</key>
24
+	<string>© 2007–2013 Neal Wilson</string>
25
+</dict>
26
+</plist>

Loading…
取消
儲存