Changeset 971 for trunk/examples/desktop/systray

Timestamp:

Aug 11, 2011, 11:11:44 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

examples: desktop/systray: Revert r263, r266, r271.

This is something that needs to be done in a separate testcase.

Location:

trunk/examples/desktop/systray

Files:

• images/test16.xpm (deleted)
• images/test20.xpm (deleted)
• images/test32.xpm (deleted)
• images/test40.xpm (deleted)
• systray.qrc (modified) (1 diff)
• window.cpp (modified) (1 diff)

trunk/examples/desktop/systray/systray.qrc

@@ -4 +4 @@
    <file>images/heart.svg</file>
    <file>images/trash.svg</file>
-   <file>images/test16.xpm</file>
-   <file>images/test32.xpm</file>
-   <file>images/test20.xpm</file>
-   <file>images/test40.xpm</file>
 </qresource>
 </RCC>

trunk/examples/desktop/systray/window.cpp

@@ -160 +160 @@
     iconComboBox->addItem(QIcon(":/images/trash.svg"), tr("Trash"));
 
-    {
-        QIcon test;
-        test.addFile(":/images/test16.xpm");
-        test.addFile(":/images/test32.xpm");
-        iconComboBox->addItem(test, tr("Test 16/32"));
-    }
-    
-    {
-        QIcon test;
-        test.addFile(":/images/test20.xpm");
-        test.addFile(":/images/test40.xpm");
-        iconComboBox->addItem(test, tr("Test 20/40"));
-    }
-    
     showIconCheckBox = new QCheckBox(tr("Show icon"));
     showIconCheckBox->setChecked(true);