diff options
-rw-r--r-- | wayland/democompositor/democompositor.pro | 2 | ||||
-rw-r--r-- | wayland/democompositor/democompositor.qrc | 20 | ||||
-rw-r--r-- | wayland/democompositor/resources/apps/clock.app (renamed from wayland/democompositor/apps/files/clock.app) | 0 | ||||
-rw-r--r-- | wayland/democompositor/resources/apps/maps.app (renamed from wayland/democompositor/apps/files/maps.app) | 0 | ||||
-rw-r--r-- | wayland/democompositor/resources/apps/rss.app (renamed from wayland/democompositor/apps/files/rss.app) | 0 | ||||
-rw-r--r-- | wayland/democompositor/resources/apps/stocqt.app (renamed from wayland/democompositor/apps/files/stocqt.app) | 0 | ||||
-rw-r--r-- | wayland/democompositor/resources/images/Icon_Clocks.png (renamed from wayland/democompositor/images/Icon_Clocks.png) | bin | 1870 -> 1870 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/Icon_Maps.png (renamed from wayland/democompositor/images/Icon_Maps.png) | bin | 1529 -> 1529 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/Icon_RSS.png (renamed from wayland/democompositor/images/Icon_RSS.png) | bin | 1769 -> 1769 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/Icon_StocQt.png (renamed from wayland/democompositor/images/Icon_StocQt.png) | bin | 1639 -> 1639 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/graydot.png (renamed from wayland/democompositor/images/graydot.png) | bin | 211 -> 211 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/graydots.png (renamed from wayland/democompositor/images/graydots.png) | bin | 247 -> 247 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/greendot.png (renamed from wayland/democompositor/images/greendot.png) | bin | 212 -> 212 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/greendots.png (renamed from wayland/democompositor/images/greendots.png) | bin | 240 -> 240 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/icon1.png (renamed from wayland/democompositor/images/icon1.png) | bin | 1700 -> 1700 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/icon2.png (renamed from wayland/democompositor/images/icon2.png) | bin | 1761 -> 1761 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/icon3.png (renamed from wayland/democompositor/images/icon3.png) | bin | 1719 -> 1719 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/icon4.png (renamed from wayland/democompositor/images/icon4.png) | bin | 1505 -> 1505 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/quit.png (renamed from wayland/democompositor/images/quit.png) | bin | 782 -> 782 bytes | |||
-rw-r--r-- | wayland/democompositor/resources/images/reddot.png (renamed from wayland/democompositor/images/reddot.png) | bin | 219 -> 219 bytes | |||
-rw-r--r-- | wayland/democompositor/tests/applist/applist.qrc | 4 | ||||
-rw-r--r-- | wayland/democompositor/tests/apps/apps.qrc | 2 |
22 files changed, 14 insertions, 14 deletions
diff --git a/wayland/democompositor/democompositor.pro b/wayland/democompositor/democompositor.pro index ff9f2b4..22b7d98 100644 --- a/wayland/democompositor/democompositor.pro +++ b/wayland/democompositor/democompositor.pro @@ -25,4 +25,4 @@ target.path = /data/user/$$TARGET # TODO. How does /data/user/$$TARGET map to QStandardPaths apps.path = /data/user/$$TARGET/apps/ -apps.files = apps/files/*.app +apps.files = resources/apps/*.app diff --git a/wayland/democompositor/democompositor.qrc b/wayland/democompositor/democompositor.qrc index 940f04e..6e8bd54 100644 --- a/wayland/democompositor/democompositor.qrc +++ b/wayland/democompositor/democompositor.qrc @@ -6,15 +6,15 @@ <file>qml/MyButton.qml</file> <file>qml/LaunchButton.qml</file> <file>qml/TimedButton.qml</file> - <file>images/quit.png</file> - <file>images/greendot.png</file> - <file>images/reddot.png</file> - <file>images/graydot.png</file> - <file>images/graydots.png</file> - <file>images/greendots.png</file> - <file>images/Icon_Clocks.png</file> - <file>images/Icon_Maps.png</file> - <file>images/Icon_RSS.png</file> - <file>images/Icon_StocQt.png</file> + <file alias="images/quit.png">resources/images/quit.png</file> + <file alias="images/greendot.png">resources/images/greendot.png</file> + <file alias="images/reddot.png">resources/images/reddot.png</file> + <file alias="images/graydot.png">resources/images/graydot.png</file> + <file alias="images/graydots.png">resources/images/graydots.png</file> + <file alias="images/greendots.png">resources/images/greendots.png</file> + <file alias="images/Icon_Clocks.png">resources/images/Icon_Clocks.png</file> + <file alias="images/Icon_Maps.png">resources/images/Icon_Maps.png</file> + <file alias="images/Icon_RSS.png">resources/images/Icon_RSS.png</file> + <file alias="images/Icon_StocQt.png">resources/images/Icon_StocQt.png</file> </qresource> </RCC> diff --git a/wayland/democompositor/apps/files/clock.app b/wayland/democompositor/resources/apps/clock.app index d6f5f56..d6f5f56 100644 --- a/wayland/democompositor/apps/files/clock.app +++ b/wayland/democompositor/resources/apps/clock.app diff --git a/wayland/democompositor/apps/files/maps.app b/wayland/democompositor/resources/apps/maps.app index e88899a..e88899a 100644 --- a/wayland/democompositor/apps/files/maps.app +++ b/wayland/democompositor/resources/apps/maps.app diff --git a/wayland/democompositor/apps/files/rss.app b/wayland/democompositor/resources/apps/rss.app index 13ffbca..13ffbca 100644 --- a/wayland/democompositor/apps/files/rss.app +++ b/wayland/democompositor/resources/apps/rss.app diff --git a/wayland/democompositor/apps/files/stocqt.app b/wayland/democompositor/resources/apps/stocqt.app index 9317359..9317359 100644 --- a/wayland/democompositor/apps/files/stocqt.app +++ b/wayland/democompositor/resources/apps/stocqt.app diff --git a/wayland/democompositor/images/Icon_Clocks.png b/wayland/democompositor/resources/images/Icon_Clocks.png Binary files differindex 0ca1955..0ca1955 100644 --- a/wayland/democompositor/images/Icon_Clocks.png +++ b/wayland/democompositor/resources/images/Icon_Clocks.png diff --git a/wayland/democompositor/images/Icon_Maps.png b/wayland/democompositor/resources/images/Icon_Maps.png Binary files differindex fac0dc9..fac0dc9 100644 --- a/wayland/democompositor/images/Icon_Maps.png +++ b/wayland/democompositor/resources/images/Icon_Maps.png diff --git a/wayland/democompositor/images/Icon_RSS.png b/wayland/democompositor/resources/images/Icon_RSS.png Binary files differindex 54ada4f..54ada4f 100644 --- a/wayland/democompositor/images/Icon_RSS.png +++ b/wayland/democompositor/resources/images/Icon_RSS.png diff --git a/wayland/democompositor/images/Icon_StocQt.png b/wayland/democompositor/resources/images/Icon_StocQt.png Binary files differindex d12aec1..d12aec1 100644 --- a/wayland/democompositor/images/Icon_StocQt.png +++ b/wayland/democompositor/resources/images/Icon_StocQt.png diff --git a/wayland/democompositor/images/graydot.png b/wayland/democompositor/resources/images/graydot.png Binary files differindex 99606e3..99606e3 100644 --- a/wayland/democompositor/images/graydot.png +++ b/wayland/democompositor/resources/images/graydot.png diff --git a/wayland/democompositor/images/graydots.png b/wayland/democompositor/resources/images/graydots.png Binary files differindex 0f90f12..0f90f12 100644 --- a/wayland/democompositor/images/graydots.png +++ b/wayland/democompositor/resources/images/graydots.png diff --git a/wayland/democompositor/images/greendot.png b/wayland/democompositor/resources/images/greendot.png Binary files differindex 0afb08f..0afb08f 100644 --- a/wayland/democompositor/images/greendot.png +++ b/wayland/democompositor/resources/images/greendot.png diff --git a/wayland/democompositor/images/greendots.png b/wayland/democompositor/resources/images/greendots.png Binary files differindex ab1e220..ab1e220 100644 --- a/wayland/democompositor/images/greendots.png +++ b/wayland/democompositor/resources/images/greendots.png diff --git a/wayland/democompositor/images/icon1.png b/wayland/democompositor/resources/images/icon1.png Binary files differindex 08f1c0c..08f1c0c 100644 --- a/wayland/democompositor/images/icon1.png +++ b/wayland/democompositor/resources/images/icon1.png diff --git a/wayland/democompositor/images/icon2.png b/wayland/democompositor/resources/images/icon2.png Binary files differindex e02dda8..e02dda8 100644 --- a/wayland/democompositor/images/icon2.png +++ b/wayland/democompositor/resources/images/icon2.png diff --git a/wayland/democompositor/images/icon3.png b/wayland/democompositor/resources/images/icon3.png Binary files differindex 9872b89..9872b89 100644 --- a/wayland/democompositor/images/icon3.png +++ b/wayland/democompositor/resources/images/icon3.png diff --git a/wayland/democompositor/images/icon4.png b/wayland/democompositor/resources/images/icon4.png Binary files differindex 3f64825..3f64825 100644 --- a/wayland/democompositor/images/icon4.png +++ b/wayland/democompositor/resources/images/icon4.png diff --git a/wayland/democompositor/images/quit.png b/wayland/democompositor/resources/images/quit.png Binary files differindex 7366d77..7366d77 100644 --- a/wayland/democompositor/images/quit.png +++ b/wayland/democompositor/resources/images/quit.png diff --git a/wayland/democompositor/images/reddot.png b/wayland/democompositor/resources/images/reddot.png Binary files differindex 06451be..06451be 100644 --- a/wayland/democompositor/images/reddot.png +++ b/wayland/democompositor/resources/images/reddot.png diff --git a/wayland/democompositor/tests/applist/applist.qrc b/wayland/democompositor/tests/applist/applist.qrc index 04db642..eb4d8da 100644 --- a/wayland/democompositor/tests/applist/applist.qrc +++ b/wayland/democompositor/tests/applist/applist.qrc @@ -1,6 +1,6 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource prefix="/"> - <file alias="app1.json">../../apps/files/clock.app</file> - <file alias="app2.json">../../apps/files/maps.app</file> + <file alias="app1.json">../../resources/apps/clock.app</file> + <file alias="app2.json">../../resources/apps/maps.app</file> </qresource> </RCC> diff --git a/wayland/democompositor/tests/apps/apps.qrc b/wayland/democompositor/tests/apps/apps.qrc index 07e0afe..a8a834b 100644 --- a/wayland/democompositor/tests/apps/apps.qrc +++ b/wayland/democompositor/tests/apps/apps.qrc @@ -1,5 +1,5 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource prefix="/"> - <file alias="app.json">../../apps/files/clock.app</file> + <file alias="app.json">../../resources/apps/clock.app</file> </qresource> </RCC> |