Changeset 98 in tspsg-svn for trunk/tspsg.pro

Timestamp:

Mar 12, 2010, 8:28:42 PM (15 years ago)

Author:

laleppa

Message:

+ Translatable About dialog.

• Improved installation rules in .pro file.
• Disabled SVG and JPEG support. They aren't needed at this point.
• Fixed a bug when labels were hardly visible under Windows Vista/7 whith translucency on and a dark background behind the application.
• Fixed a bug when Main Window area was blank if the application was compiled using Qt < 4.6.0.

File:

• trunk/tspsg.pro (modified) (8 diffs)

trunk/tspsg.pro

@@ -11 +11 @@
 ######################################################################
 
-QT += svg
+#QT += svg
 
 TEMPLATE = app
@@ -23 +23 @@
 BUILD_RELEASE = 2
 
-# This one is only defined on releases
+# These are only defined on releases
 #DEFINES += TSPSG_RELEASE_BUILD
+#DEFINES += BUILD_STATUS="\"(alpha 2)\""
 
 REVISION = $$system(svnversion)
@@ -46 +47 @@
 contains(QMAKE_PRL_CONFIG, static) {
 # We "embed" SVG and JPEG support on static build
-        QTPLUGIN += qjpeg qsvg
+#       QTPLUGIN += qjpeg qsvg
         DEFINES += STATIC_BUILD
 }
@@ -53 +54 @@
         OBJECTS_DIR = release
         DESTDIR = release
+        D = d
 } else {
         OBJECTS_DIR = debug
         DESTDIR = debug
         DEFINES += DEBUG
+        D =
 }
 
@@ -90 +93 @@
         l10n.path = $$PREFIX/share/TSPSG/l10n
         docs.path = $$PREFIX/share/doc/TSPSG-$$VERSION
+        apps.files = resources/tspsg.desktop
         apps.path = $$PREFIX/share/applications/
-        apps.files = resources/tspsg.desktop
+        icon.files = resources/tspsg.png
         icon.path = $$PREFIX/share/pixmaps
-        icon.files = resources/tspsg.png
         INSTALLS += apps icon
 }
@@ -99 +102 @@
 # TODO: MacOSX
 
-# For win32: everything goes to "C:\Program Files\TSPSG" and subfolders.
+# For win32: everything goes to "%PROGRAMFILES%\TSPSG" and subfolders.
 win32 {
-        PREFIX = "C:\Program Files"
+        PREFIX = "$$(PROGRAMFILES)"
 
-        CONFIG(release, debug|release) {
-                imageformats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qsvg4.dll \
-                        $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg4.dll
-        } else {
-                imageformats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qsvgd4.dll \
-                        $$[QT_INSTALL_PLUGINS]/imageformats/qjpegd4.dll
-        }
+        share.files = $$[QT_INSTALL_LIBS]/QtCore$${D}4.dll \
+                $$[QT_INSTALL_LIBS]/QtGui$${D}4.dll \
+                $$[QT_INSTALL_LIBS]/QtSvg$${D}4.dll
+        imageformats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qsvg$${D}4.dll \
+                $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${D}4.dll
         imageformats.path = $$PREFIX/TSPSG/imageformats
         INSTALLS += imageformats
@@ -117 +118 @@
 wince {
         PREFIX = "\Program Files"
+        share.sources = $$share.files
+        l10n.sources = $$l10n.files
+        docs.sources = $$docs.files
+
         DEPLOYMENT += target share l10n docs
-        DEPLOYMENT_PLUGIN += qjpeg qsvg
+#       DEPLOYMENT_PLUGIN += qjpeg qsvg
 }
 
@@ -133 +138 @@
 # Symbian
 symbian {
+        # qmake for Symbian (as of Qt 4.6.2) has a bug: file masks doesn't work, so we need to specify all files manually
+        share.sources = $$share.files
+        l10n.sources = l10n/qt_ru.qm l10n/qt_uk.qm l10n/tspsg_en.qm l10n/tspsg_ru.qm l10n/tspsg_uk.qm
         l10n.path = l10n
+        docs.sources = $$docs.files
         docs.pkg_prerules = \
                 "\"README\" - \"\", FILETEXT, TEXTCONTINUE" \
                 "\"COPYING\" - \"\", FILETEXT, TEXTEXIT"
         DEPLOYMENT += share l10n docs
-        DEPLOYMENT_PLUGIN += qjpeg qsvg
+#       DEPLOYMENT_PLUGIN += qjpeg qsvg
 
         ICON = resources/tspsg.svg
 
         appinfo = \
-                "$$LITERAL_HASH{\"TSPSG\"},(0xEb9dce0e),0,1,2"
+                "$$LITERAL_HASH{\"TSPSG\"},(0xEb9dce0e),$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR,$$BUILD_RELEASE"
         vendorinfo = \
                 "%{\"l-homes.org\"}" \