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

Conflicts:
	src/Typica.pro

src/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>logo.icns</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Typica 1.4.3</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleExecutable</key>
+	<string>Typica</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.wilsonscoffee.Typica</string>
+	<key>CFBundleDisplayName</key>
+	<string>Typica</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.4.3</string>
+	<key>CFBundleVersion</key>
+	<string>1.4.3</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© 2007–2013 Neal Wilson</string>
+</dict>
+</plist>

src/Typica.pro

@@ -1,30 +1,31 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Sat May 23 23:41:13 2009
-######################################################################
-
-QT += script
-QT += xml
-QT += sql
-QT += xmlpatterns
-QT += scripttools
-QT += webkit
-
-include(3rdparty/qextserialport/src/qextserialport.pri)
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-
-# Input
-HEADERS += moc_typica.cpp \
-    helpmenu.h \
-    abouttypica.h
-SOURCES += typica.cpp \
-    helpmenu.cpp \
-    abouttypica.cpp
-
-RESOURCES += \
-    resources.qrc
-
-RC_FILE = typica.rc
-ICON = resources/icons/appicons/logo.icns
+######################################################################
+# Automatically generated by qmake (2.01a) Sat May 23 23:41:13 2009
+######################################################################
+
+QT += script
+QT += xml
+QT += sql
+QT += xmlpatterns
+QT += scripttools
+QT += webkit
+
+include(3rdparty/qextserialport/src/qextserialport.pri)
+
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+
+# Input
+HEADERS += moc_typica.cpp \
+    helpmenu.h \
+    abouttypica.h
+SOURCES += typica.cpp \
+    helpmenu.cpp \
+    abouttypica.cpp
+
+RESOURCES += \
+    resources.qrc
+
+RC_FILE = typica.rc
+ICON = resources/icons/appicons/logo.icns
+QMAKE_INFO_PLIST = resources/Info.plist

src/resources/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>@ICON@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Typica 1.4.3</string>
+	<key>CFBundleSignature</key>
+	<string>@TYPEINFO@</string>
+	<key>CFBundleExecutable</key>
+	<string>@EXECUTABLE@</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.wilsonscoffee.@EXECUTABLE@</string>
+	<key>CFBundleDisplayName</key>
+	<string>Typica</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.4.3</string>
+	<key>CFBundleVersion</key>
+	<string>1.4.3</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© 2007–2013 Neal Wilson</string>
+</dict>
+</plist>