Changeset 137 in tspsg-svn

Timestamp:

Sep 15, 2010, 4:57:37 PM (14 years ago)

Author:

laleppa

Message:

Use of SVG icons increased TSPSG startup time considerably.
Reverting back to 128x128 PNGs on desktop.

Location:

trunk

Files:

• install.pri (modified) (3 diffs)
• resources/desktop-scalable.qrc (deleted)
• resources/icons/scalable (deleted)
• src/globals.h (modified) (1 diff)
• tspsg.pri (modified) (1 diff)
• tspsg.pro (modified) (1 diff)

trunk/install.pri

@@ -58 +58 @@
                         $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll
         }
-        iconengines.files = $$[QT_INSTALL_PLUGINS]/iconengines/qsvgicon$${D}4.dll
-        iconengines.path = $$PREFIX/TSPSG/iconengines
+#       iconengines.files = $$[QT_INSTALL_PLUGINS]/iconengines/qsvgicon$${D}4.dll
+#       iconengines.path = $$PREFIX/TSPSG/iconengines
         imageformats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${D}4.dll \
                 $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${D}4.dll
         imageformats.path = $$PREFIX/TSPSG/imageformats
-        INSTALLS += iconengines imageformats
+        INSTALLS += imageformats # iconengines
 }
 
@@ -75 +75 @@
 
         DEPLOYMENT += target share docs # l10n
-#       DEPLOYMENT_PLUGIN += qjpeg qtiff
+#       DEPLOYMENT_PLUGIN += qjpeg qtiff qsvgicon
 }
 
@@ -101 +101 @@
                 "\"COPYING\" - \"\", FILETEXT, TEXTEXIT"
         DEPLOYMENT += share docs # l10n
-#       DEPLOYMENT_PLUGIN += qjpeg qtiff
+#       DEPLOYMENT_PLUGIN += qjpeg qtiff qsvgicon
 
         ICON = resources/tspsg.svg

trunk/src/globals.h

@@ -130 +130 @@
         #define ICON_SIZE "32x32"
         #define ICON_FORMAT "png"
-#elif !defined(NOSVG)
-        #define ICON_SIZE "scalable"
-        #define ICON_FORMAT "svgz"
 #else
         #define ICON_SIZE "128x128"

trunk/tspsg.pri

@@ -40 +40 @@
         l10n/l10n.qrc
 
-!wincewm*:!symbian {
-        !nosvg {
-                RESOURCES += resources/desktop-scalable.qrc
-        } else {
-                RESOURCES += resources/desktop.qrc
-        }
+wincewm*|symbian {
+        RESOURCES += resources/handheld.qrc
 } else {
-        RESOURCES += resources/handheld.qrc
+        RESOURCES += resources/desktop.qrc
 }
 

trunk/tspsg.pro

@@ -39 +39 @@
 REVISION = $$replace(REVISION,":","")
 REVISION = $$replace(REVISION,"M","")
-#VERSION = $$sprintf("%1.%2.%3.%4",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR,$$BUILD_RELEASE,$$REVISION)
 win32-msvc*|wincewm* {
         VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)