Fixed Qt 4.6 source package compilation by moving the qvfb skins.

Move skins to tools/shared/deviceskin and have them
included automatically by the profile.
Acked-by: Jason McDonald <jason.mcdonald@nokia.com>
Acked-by: Warwick Allison <warwick.allison@nokia.com>

68 files changed, 1 insertions, 1173 deletions

diff --git a/tools/qvfb/ClamshellPhone.qrc b/tools/qvfb/ClamshellPhone.qrc
deleted file mode 100644
index 39cd422..0000000
--- a/tools/qvfb/ClamshellPhone.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>ClamshellPhone.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/ClamshellPhone.skin/ClamshellPhone.skin b/tools/qvfb/ClamshellPhone.skin/ClamshellPhone.skin
deleted file mode 100644
index cb24a8e..0000000
--- a/tools/qvfb/ClamshellPhone.skin/ClamshellPhone.skin
+++ /dev/null
@@ -1,30 +0,0 @@
-[SkinFile]
-Up=ClamshellPhone1-5.png
-Down=ClamshellPhone1-5-pressed.png
-Closed=ClamshellPhone1-5-closed.png
-Screen=72 84 176 208
-Areas=22
-HasMouseHover=false
-
-"Power"    0x0100000a 205 563 249 586
-"1"        0x0031 62 414 119 438
-"2"        0x0032 130 414 189 438
-"3"        0x0033 198 413 257 438
-"4"        0x0034 54 444 117 470
-"5"        0x0035 128 444 189 471
-"6"        0x0036 202 444 264 471
-"7"        0x0037 47 477 113 507
-"8"        0x0038 126 477 190 507
-"9"        0x0039 205 478 270 509
-"*"        0x002a 39 515 110 552
-"0"        0x0030 122 515 195 553
-"#"        0x0023 207 516 280 553
-"Context1" 0x01100000 137 360 108 383 123 410 90 409 60 387 63 378 100 362 
-"Back"     0x01000061 184 361 206 376 213 387 197 410 226 410 256 392 258 381 244 369
-"Backspace" 0x01000003 68 563 113 587
-"Select"   0x01010000 160 391 172 390 181 386 184 381 180 377 173 373 165 372 155 372 145 375 138 378 136 382 138 387 147 390 
-"Left"     0x1000012 141 390 136 385 136 381 143 375 132 371 120 380 121 393 129 401 
-"Down"     0x1000015 143 389 130 402 162 412 191 404 175 390 
-"Right"    0x1000014 186 370 176 375 184 382 182 387 175 390 190 404 201 396 202 375 
-"Up"       0x1000013 133 370 143 374 176 374 185 370 169 362 149 362 
-"Flip"     0x01100006 98 325 225 353
diff --git a/tools/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png b/tools/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
deleted file mode 100644
index 88ba3a1..0000000
--- a/tools/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
+++ /dev/null
diff --git a/tools/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png b/tools/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png
deleted file mode 100644
index 971cdef..0000000
--- a/tools/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png
+++ /dev/null
diff --git a/tools/qvfb/ClamshellPhone.skin/ClamshellPhone1-5.png b/tools/qvfb/ClamshellPhone.skin/ClamshellPhone1-5.png
deleted file mode 100644
index f3550ee..0000000
--- a/tools/qvfb/ClamshellPhone.skin/ClamshellPhone1-5.png
+++ /dev/null
diff --git a/tools/qvfb/ClamshellPhone.skin/defaultbuttons.conf b/tools/qvfb/ClamshellPhone.skin/defaultbuttons.conf
deleted file mode 100644
index e349dbc..0000000
--- a/tools/qvfb/ClamshellPhone.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/datebook.desktop
-3=Applications
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Games
-7=Settings/Beaming.desktop
-8=Applications/simapp.desktop,Applications/calculator.desktop
-9=Settings
-*=Applications/mediarecorder.desktop
-0=Applications/todolist.desktop
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Select
-Key2=Back
-Key3=Flip
-Key4=Backspace
-[TextButtons]
-Buttons=0123456789*#
-Hold0='0
-Hold1='1
-Hold2='2
-Hold3='3
-Hold4='4
-Hold5='5
-Hold6='6
-Hold7='7
-Hold8='8
-Hold9='9
-Hold*=symbol
-Hold#=mode
-Tap0=space
-Tap1="\".,'?!-@:1"
-Tap2="\"a\xe4\xe5\xe6\xe0\xe1\xe2\x62\x63\xe7\x32"
-Tap3="\"de\xe8\xe9\xea\x66\x33"
-Tap4="\"ghi\xec\xed\xee\x34"
-Tap5="\"jkl5"
-Tap6="\"mn\xf1o\xf6\xf8\xf2\xf3\x36"
-Tap7="\"pqrs\xdf\x37"
-Tap8="\"tu\xfc\xf9\xfav8"
-Tap9="\"wxyz9"
-Tap*=modify
-Tap#=shift
-[LocaleTextButtons]
-Buttons=23456789
-Tap2[]='abc
-Tap3[]='def
-Tap4[]='ghi
-Tap5[]='jkl
-Tap6[]='mno
-Tap7[]='pqrs
-Tap8[]='tuv
-Tap9[]='wxyz
-[PhoneTextButtons]
-Buttons=*#
-Tap*='*+pw
-Hold*=+
-Tap#=#
-Hold#=mode
-[Device]
-PrimaryInput=Keypad
diff --git a/tools/qvfb/DualScreenPhone.skin/DualScreen-pressed.png b/tools/qvfb/DualScreenPhone.skin/DualScreen-pressed.png
deleted file mode 100644
index d62ef4a..0000000
--- a/tools/qvfb/DualScreenPhone.skin/DualScreen-pressed.png
+++ /dev/null
diff --git a/tools/qvfb/DualScreenPhone.skin/DualScreen.png b/tools/qvfb/DualScreenPhone.skin/DualScreen.png
deleted file mode 100644
index cb3d1a7..0000000
--- a/tools/qvfb/DualScreenPhone.skin/DualScreen.png
+++ /dev/null
diff --git a/tools/qvfb/DualScreenPhone.skin/DualScreenPhone.skin b/tools/qvfb/DualScreenPhone.skin/DualScreenPhone.skin
deleted file mode 100644
index a82ef23..0000000
--- a/tools/qvfb/DualScreenPhone.skin/DualScreenPhone.skin
+++ /dev/null
@@ -1,29 +0,0 @@
-[SkinFile]
-Up=DualScreen.png
-Down=DualScreen-pressed.png
-Screen=128 155 176 208
-BackScreen=18 44 98 119
-Areas=21
-HasMouseHover=false
-
-"Context1"	0x1100000 144 368 189 368 168 396 176 427 150 398
-"Back"	0x1000061 245 365 291 366 283 398 258 424 265 394
-"Select"	0x1010000 202 401 210 389 224 388 233 402 224 415 208 415
-"Up"	0x1000013 202 381 196 374 218 363 239 373 229 382
-"Left"	0x1000012 199 385 189 375 176 403 185 426 197 415 194 401
-"Right"	0x1000014 235 390 248 379 253 402 246 421 238 413
-"Down"	0x1000015 204 421 233 422 241 432 214 443 191 430
-"Call"	0x1100004 163 452 137 450 125 465 136 484 159 485 169 467
-"Hangup"	0x1100005 266 475 279 448 295 447 309 460 301 480 289 487
-"1"	0x31 175 514 147 504 133 518 161 532 180 534
-"2"	0x32 199 515 229 519 238 533 222 540 195 538
-"2"	0x32 260 512 286 506 299 513 284 527 264 535 248 525
-"4"	0x34 164 541 177 546 182 560 164 565 146 560 135 545 154 539
-"5"	0x35 204 546 225 546 243 560 231 574 205 573 191 558
-"6"	0x36 257 547 281 537 294 540 287 555 274 566 254 561
-"7"	0x37 145 569 176 578 177 595 156 597 138 584
-"8"	0x38 197 582 229 584 241 593 226 604 201 603 189 594
-"9"	0x39 253 577 288 564 301 578 283 593 259 597 251 586
-"*"	0x2a 145 598 181 611 182 623 163 632 144 623 138 607
-"0"	0x30 196 611 233 613 240 630 220 642 193 637 191 622
-"#"	0x23 255 610 286 600 302 615 279 625 258 629 247 616
diff --git a/tools/qvfb/DualScreenPhone.skin/defaultbuttons.conf b/tools/qvfb/DualScreenPhone.skin/defaultbuttons.conf
deleted file mode 100644
index 1103350..0000000
--- a/tools/qvfb/DualScreenPhone.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/datebook.desktop
-3=Applications
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Games
-7=Settings/Beaming.desktop
-8=Applications/simapp.desktop,Applications/calculator.desktop
-9=Settings
-*=Applications/mediarecorder.desktop
-0=Applications/todolist.desktop
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Select
-Key2=Back
-Key3=Call
-Key4=Hangup
-[TextButtons]
-Buttons=0123456789*#
-Hold0='0
-Hold1='1
-Hold2='2
-Hold3='3
-Hold4='4
-Hold5='5
-Hold6='6
-Hold7='7
-Hold8='8
-Hold9='9
-Hold*=symbol
-Hold#=mode
-Tap0=space
-Tap1="\".,'?!-@:1"
-Tap2="\"a\xe4\xe5\xe6\xe0\xe1\xe2\x62\x63\xe7\x32"
-Tap3="\"de\xe8\xe9\xea\x66\x33"
-Tap4="\"ghi\xec\xed\xee\x34"
-Tap5="\"jkl5"
-Tap6="\"mn\xf1o\xf6\xf8\xf2\xf3\x36"
-Tap7="\"pqrs\xdf\x37"
-Tap8="\"tu\xfc\xf9\xfav8"
-Tap9="\"wxyz9"
-Tap*=modify
-Tap#=shift
-[LocaleTextButtons]
-Buttons=23456789
-Tap2[]='abc
-Tap3[]='def
-Tap4[]='ghi
-Tap5[]='jkl
-Tap6[]='mno
-Tap7[]='pqrs
-Tap8[]='tuv
-Tap9[]='wxyz
-[PhoneTextButtons]
-Buttons=*#
-Tap*='*+pw
-Hold*=+
-Tap#='#
-Hold#=mode
-[Device]
-PrimaryInput=Keypad
diff --git a/tools/qvfb/PDAPhone.qrc b/tools/qvfb/PDAPhone.qrc
deleted file mode 100644
index 1a1c35a..0000000
--- a/tools/qvfb/PDAPhone.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>PDAPhone.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/PDAPhone.skin/PDAPhone.skin b/tools/qvfb/PDAPhone.skin/PDAPhone.skin
deleted file mode 100644
index d6a1966..0000000
--- a/tools/qvfb/PDAPhone.skin/PDAPhone.skin
+++ /dev/null
@@ -1,18 +0,0 @@
-[SkinFile]
-Up=pda_up.png
-Down=pda_down.png
-Screen=42 59 176 220 
-Cursor=finger.png 20 20
-Areas=10
-HasMouseHover=false
-
-"Power"	     0x0100000a  117  21  141 42
-"Context1"   0x01100000   43 284  74 315
-"Call"	     0x01100004   74 284 104 315 
-"Hangup"     0x01100005  154 284 184 315
-"Back"	     0x01000061  184 284 214 315
-"Left"	     0x1000012  123 315 110 326 106 307 113 288 123 300 120 307
-"Down"	     0x1000015  123 315 130 318 138 315 150 326 129 335 111 325
-"Right"	     0x1000014  137 301 149 290 155 308 150 324 138 315 140 308
-"Up"	     0x1000013  123 300 112 289 130 282 149 290 137 300 130 298 
-"Select"     0x01010000  131 298 137 300 140 307 138 315 130 318 123 316 120 307 123 300
diff --git a/tools/qvfb/PDAPhone.skin/defaultbuttons.conf b/tools/qvfb/PDAPhone.skin/defaultbuttons.conf
deleted file mode 100644
index e3ae813..0000000
--- a/tools/qvfb/PDAPhone.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/datebook.desktop
-3=Applications
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Games
-7=Settings/Beaming.desktop
-8=Applications/simapp.desktop,Applications/calculator.desktop
-9=Settings
-*=Applications/mediarecorder.desktop
-0=Applications/todolist.desktop
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Back
-Key2=Select
-Key3=Call
-Key4=Hangup
-[Device]
-PrimaryInput=Touchscreen
diff --git a/tools/qvfb/PDAPhone.skin/finger.png b/tools/qvfb/PDAPhone.skin/finger.png
deleted file mode 100644
index 24cf0cb..0000000
--- a/tools/qvfb/PDAPhone.skin/finger.png
+++ /dev/null
diff --git a/tools/qvfb/PDAPhone.skin/pda_down.png b/tools/qvfb/PDAPhone.skin/pda_down.png
deleted file mode 100644
index f65c059..0000000
--- a/tools/qvfb/PDAPhone.skin/pda_down.png
+++ /dev/null
diff --git a/tools/qvfb/PDAPhone.skin/pda_up.png b/tools/qvfb/PDAPhone.skin/pda_up.png
deleted file mode 100644
index 541e3c4..0000000
--- a/tools/qvfb/PDAPhone.skin/pda_up.png
+++ /dev/null
diff --git a/tools/qvfb/PortableMedia.qrc b/tools/qvfb/PortableMedia.qrc
deleted file mode 100644
index a902f1a..0000000
--- a/tools/qvfb/PortableMedia.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>PortableMedia.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/PortableMedia.skin/PortableMedia.skin b/tools/qvfb/PortableMedia.skin/PortableMedia.skin
deleted file mode 100644
index b76e5cf..0000000
--- a/tools/qvfb/PortableMedia.skin/PortableMedia.skin
+++ /dev/null
@@ -1,14 +0,0 @@
-[SkinFile]
-Up=portablemedia.png
-Down=portablemedia-pressed.png
-Screen=18 20 480 272
-Areas=7
-HasMouseHover=false
-
-"Context1" 0x01100000 530 192 565 223
-"Back"     0x01000061 530 138 565 173
-"Select"   0x01010000 530 65 565 98
-"Left"     0x1000012 529 67 519 57 511 65 511 104 519 110 529 100 529 98
-"Down"     0x1000015 530 102 520 111 529 120 569 120 577 114 566 103 564 103
-"Right"    0x1000014 565 65 576 52 585 67 585 102 578 113 567 104
-"Up"       0x1000013 530 65 519 55 528 48 567 48 573 51 564 66
diff --git a/tools/qvfb/PortableMedia.skin/defaultbuttons.conf b/tools/qvfb/PortableMedia.skin/defaultbuttons.conf
deleted file mode 100644
index 514e881..0000000
--- a/tools/qvfb/PortableMedia.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Menu]
-Map=123
-Default=1
-1=Applications/mediaplayer.desktop
-2=Applications/photoedit.desktop
-3=Settings
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Select
-Key2=Back
-[Device]
-PrimaryInput=Keypad
diff --git a/tools/qvfb/PortableMedia.skin/portablemedia-pressed.png b/tools/qvfb/PortableMedia.skin/portablemedia-pressed.png
deleted file mode 100644
index 730e762..0000000
--- a/tools/qvfb/PortableMedia.skin/portablemedia-pressed.png
+++ /dev/null
diff --git a/tools/qvfb/PortableMedia.skin/portablemedia.png b/tools/qvfb/PortableMedia.skin/portablemedia.png
deleted file mode 100644
index e44cbe1..0000000
--- a/tools/qvfb/PortableMedia.skin/portablemedia.png
+++ /dev/null
diff --git a/tools/qvfb/PortableMedia.skin/portablemedia.xcf b/tools/qvfb/PortableMedia.skin/portablemedia.xcf
deleted file mode 100644
index 127e07c..0000000
--- a/tools/qvfb/PortableMedia.skin/portablemedia.xcf
+++ /dev/null
diff --git a/tools/qvfb/S60-QVGA-Candybar.qrc b/tools/qvfb/S60-QVGA-Candybar.qrc
deleted file mode 100644
index 8138484..0000000
--- a/tools/qvfb/S60-QVGA-Candybar.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>S60-QVGA-Candybar.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/S60-QVGA-Candybar.skin/S60-QVGA-Candybar-down.png b/tools/qvfb/S60-QVGA-Candybar.skin/S60-QVGA-Candybar-down.png
deleted file mode 100644
index 89d40cb..0000000
--- a/tools/qvfb/S60-QVGA-Candybar.skin/S60-QVGA-Candybar-down.png
+++ /dev/null
diff --git a/tools/qvfb/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.png b/tools/qvfb/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.png
deleted file mode 100644
index 0d0e598..0000000
--- a/tools/qvfb/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.png
+++ /dev/null
diff --git a/tools/qvfb/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.skin b/tools/qvfb/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.skin
deleted file mode 100644
index 4f8fe5d..0000000
--- a/tools/qvfb/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.skin
+++ /dev/null
@@ -1,15 +0,0 @@
-[SkinFile]
-Up=S60-QVGA-Candybar.png
-Down=S60-QVGA-Candybar-down.png
-Screen=61 93 240 320
-Areas=7
-HasMouseHover=false
-
-
-"Context1" 0x01100000 54 469 151 469 140 483 88 485 81 496 54 498 
-"Back"     0x01000061 211 468 307 467 307 498 278 497 219 486
-"Select"   0x01010000 165 491 196 522
-"Left"     0x1000012 149 474 166 492 163 519 143 538 142 481
-"Down"     0x1000015 164 521 195 522 212 539 204 545 154 544 145 536
-"Right"    0x1000014 214 475 219 487 219 528 212 539 196 522 197 492
-"Up"       0x1000013 150 474 156 467 209 467 213 476 197 489 165 489
diff --git a/tools/qvfb/S60-QVGA-Candybar.skin/defaultbuttons.conf b/tools/qvfb/S60-QVGA-Candybar.skin/defaultbuttons.conf
deleted file mode 100644
index e349dbc..0000000
--- a/tools/qvfb/S60-QVGA-Candybar.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/datebook.desktop
-3=Applications
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Games
-7=Settings/Beaming.desktop
-8=Applications/simapp.desktop,Applications/calculator.desktop
-9=Settings
-*=Applications/mediarecorder.desktop
-0=Applications/todolist.desktop
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Select
-Key2=Back
-Key3=Flip
-Key4=Backspace
-[TextButtons]
-Buttons=0123456789*#
-Hold0='0
-Hold1='1
-Hold2='2
-Hold3='3
-Hold4='4
-Hold5='5
-Hold6='6
-Hold7='7
-Hold8='8
-Hold9='9
-Hold*=symbol
-Hold#=mode
-Tap0=space
-Tap1="\".,'?!-@:1"
-Tap2="\"a\xe4\xe5\xe6\xe0\xe1\xe2\x62\x63\xe7\x32"
-Tap3="\"de\xe8\xe9\xea\x66\x33"
-Tap4="\"ghi\xec\xed\xee\x34"
-Tap5="\"jkl5"
-Tap6="\"mn\xf1o\xf6\xf8\xf2\xf3\x36"
-Tap7="\"pqrs\xdf\x37"
-Tap8="\"tu\xfc\xf9\xfav8"
-Tap9="\"wxyz9"
-Tap*=modify
-Tap#=shift
-[LocaleTextButtons]
-Buttons=23456789
-Tap2[]='abc
-Tap3[]='def
-Tap4[]='ghi
-Tap5[]='jkl
-Tap6[]='mno
-Tap7[]='pqrs
-Tap8[]='tuv
-Tap9[]='wxyz
-[PhoneTextButtons]
-Buttons=*#
-Tap*='*+pw
-Hold*=+
-Tap#=#
-Hold#=mode
-[Device]
-PrimaryInput=Keypad
diff --git a/tools/qvfb/S60-nHD-Touchscreen.qrc b/tools/qvfb/S60-nHD-Touchscreen.qrc
deleted file mode 100644
index daf0cc3..0000000
--- a/tools/qvfb/S60-nHD-Touchscreen.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>S60-nHD-Touchscreen.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen-down.png b/tools/qvfb/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen-down.png
deleted file mode 100644
index 7253e38..0000000
--- a/tools/qvfb/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen-down.png
+++ /dev/null
diff --git a/tools/qvfb/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.png b/tools/qvfb/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.png
deleted file mode 100644
index 675563e..0000000
--- a/tools/qvfb/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.png
+++ /dev/null
diff --git a/tools/qvfb/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.skin b/tools/qvfb/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.skin
deleted file mode 100644
index ed25d0e..0000000
--- a/tools/qvfb/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.skin
+++ /dev/null
@@ -1,10 +0,0 @@
-[SkinFile]
-Up=S60-nHD-Touchscreen.png
-Down=S60-nHD-Touchscreen-down.png
-Screen=53 183 360 640
-Areas=3
-HasMouseHover=false
-
-"Call"	     0x01100004 76 874 171 899
-"Hangup"     0x01100005 300 876 393 899
-"Home"       0x1000010   174 878 298 899
diff --git a/tools/qvfb/S60-nHD-Touchscreen.skin/defaultbuttons.conf b/tools/qvfb/S60-nHD-Touchscreen.skin/defaultbuttons.conf
deleted file mode 100644
index 6665125..0000000
--- a/tools/qvfb/S60-nHD-Touchscreen.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/mediaplayer.desktop
-3=Applications/simapp.desktop,Applications/calculator.desktop
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Applications/datebook.desktop
-7=Games
-8=Settings/beaming.desktop
-9=Applications/todolist.desktop
-*=Settings
-0=Applications
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Back
-Key2=Select
-Key3=Call
-Key4=Hangup
-[Device]
-PrimaryInput=Touchscreen
-[Button]
-Count=2
-[Button0]
-Name[]=Home Button
-Key=Home
-PressedActionMappable=0
-PressedActionService=TaskManager
-PressedActionMessage=multitask()
-HeldActionMappable=0
-HeldActionService=TaskManager
-HeldActionMessage=showRunningTasks()
-[Button1]
-Name=Power Button
-Key=Hangup
-HeldActionService=Launcher
-HeldActionMessage=execute(QString)
-HeldActionArgs=@ByteArray(\0\0\0\x1\0\0\0\n\0\0\0\0\x10\0s\0h\0u\0t\0\x64\0o\0w\0n)
diff --git a/tools/qvfb/SmartPhone.qrc b/tools/qvfb/SmartPhone.qrc
deleted file mode 100644
index 8bb5325..0000000
--- a/tools/qvfb/SmartPhone.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>SmartPhone.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/SmartPhone.skin/SmartPhone-pressed.png b/tools/qvfb/SmartPhone.skin/SmartPhone-pressed.png
deleted file mode 100644
index d0db2ed..0000000
--- a/tools/qvfb/SmartPhone.skin/SmartPhone-pressed.png
+++ /dev/null
diff --git a/tools/qvfb/SmartPhone.skin/SmartPhone.png b/tools/qvfb/SmartPhone.skin/SmartPhone.png
deleted file mode 100644
index e6ac5a0..0000000
--- a/tools/qvfb/SmartPhone.skin/SmartPhone.png
+++ /dev/null
diff --git a/tools/qvfb/SmartPhone.skin/SmartPhone.skin b/tools/qvfb/SmartPhone.skin/SmartPhone.skin
deleted file mode 100644
index 2f44c5a..0000000
--- a/tools/qvfb/SmartPhone.skin/SmartPhone.skin
+++ /dev/null
@@ -1,28 +0,0 @@
-[SkinFile]
-Up=SmartPhone.png
-Down=SmartPhone-pressed.png
-Screen=90 107 176 208
-Areas=21
-HasMouseHover=false
-
-"1"        0x0031 138 459 149 473 142 483 120 484 102 477 95 464 99 457 121 454
-"2"        0x0032 153 467 202 492
-"3"        0x0033 258 457 260 470 243 483 215 484 207 474 218 460 248 453
-"4"        0x0034 138 492 149 506 142 516 120 517 102 510 95 497 99 490 121 487
-"5"        0x0035 153 499 202 524
-"6"        0x0036 258 489 260 502 243 515 215 516 207 506 218 492 248 485
-"7"        0x0037 138 524 149 538 142 548 120 549 102 542 95 529 99 522 121 519
-"8"        0x0038 153 531 202 556
-"9"        0x0039 258 521 260 534 243 547 215 548 207 538 218 524 248 517
-"*"        0x002a 138 556 149 570 142 580 120 581 102 574 95 561 99 554 121 551
-"0"        0x0030 153 564 202 589
-"#"        0x0023 258 554 260 567 243 580 215 581 207 571 218 557 248 550
-"Call"     0x01100004  88 395 130 439
-"Hangup"   0x01100005 227 395 269 439
-"Context1" 0x01100000 145 321 134 333 132 361 134 374 110 343 109 318
-"Back"     0x01000061 249 322 240 354 219 373 223 344 216 325 208 318
-"Select"   0x01010000 160 338 195 371
-"Left"     0x1000012 159 338 149 328 141 336 141 373 149 381 159 371 159 369
-"Down"     0x1000015 160 373 150 382 159 391 199 391 207 385 196 374 194 374
-"Right"    0x1000014 195 336 206 323 215 338 215 373 208 384 197 375
-"Up"       0x1000013 160 336 149 326 158 319 197 319 203 322 194 337
diff --git a/tools/qvfb/SmartPhone.skin/defaultbuttons.conf b/tools/qvfb/SmartPhone.skin/defaultbuttons.conf
deleted file mode 100644
index 1103350..0000000
--- a/tools/qvfb/SmartPhone.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/datebook.desktop
-3=Applications
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Games
-7=Settings/Beaming.desktop
-8=Applications/simapp.desktop,Applications/calculator.desktop
-9=Settings
-*=Applications/mediarecorder.desktop
-0=Applications/todolist.desktop
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Select
-Key2=Back
-Key3=Call
-Key4=Hangup
-[TextButtons]
-Buttons=0123456789*#
-Hold0='0
-Hold1='1
-Hold2='2
-Hold3='3
-Hold4='4
-Hold5='5
-Hold6='6
-Hold7='7
-Hold8='8
-Hold9='9
-Hold*=symbol
-Hold#=mode
-Tap0=space
-Tap1="\".,'?!-@:1"
-Tap2="\"a\xe4\xe5\xe6\xe0\xe1\xe2\x62\x63\xe7\x32"
-Tap3="\"de\xe8\xe9\xea\x66\x33"
-Tap4="\"ghi\xec\xed\xee\x34"
-Tap5="\"jkl5"
-Tap6="\"mn\xf1o\xf6\xf8\xf2\xf3\x36"
-Tap7="\"pqrs\xdf\x37"
-Tap8="\"tu\xfc\xf9\xfav8"
-Tap9="\"wxyz9"
-Tap*=modify
-Tap#=shift
-[LocaleTextButtons]
-Buttons=23456789
-Tap2[]='abc
-Tap3[]='def
-Tap4[]='ghi
-Tap5[]='jkl
-Tap6[]='mno
-Tap7[]='pqrs
-Tap8[]='tuv
-Tap9[]='wxyz
-[PhoneTextButtons]
-Buttons=*#
-Tap*='*+pw
-Hold*=+
-Tap#='#
-Hold#=mode
-[Device]
-PrimaryInput=Keypad
diff --git a/tools/qvfb/SmartPhone2.qrc b/tools/qvfb/SmartPhone2.qrc
deleted file mode 100644
index 751e985..0000000
--- a/tools/qvfb/SmartPhone2.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>SmartPhone2.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/SmartPhone2.skin/SmartPhone2-pressed.png b/tools/qvfb/SmartPhone2.skin/SmartPhone2-pressed.png
deleted file mode 100644
index d4eb5b0..0000000
--- a/tools/qvfb/SmartPhone2.skin/SmartPhone2-pressed.png
+++ /dev/null
diff --git a/tools/qvfb/SmartPhone2.skin/SmartPhone2.png b/tools/qvfb/SmartPhone2.skin/SmartPhone2.png
deleted file mode 100644
index 48ccc1c..0000000
--- a/tools/qvfb/SmartPhone2.skin/SmartPhone2.png
+++ /dev/null
diff --git a/tools/qvfb/SmartPhone2.skin/SmartPhone2.skin b/tools/qvfb/SmartPhone2.skin/SmartPhone2.skin
deleted file mode 100644
index 16884bf..0000000
--- a/tools/qvfb/SmartPhone2.skin/SmartPhone2.skin
+++ /dev/null
@@ -1,25 +0,0 @@
-SmartPhone2.png SmartPhone2-pressed.png
-90 107
-176 220
-21
-"Menu"         0x01100000 70 400 115 427            
-"Backspace"    0x01000003 238 400 285 427            
-"1"	       0x0031 138 437 149 451 142 461 120 462 102 455 95 442 99 435 121 432
-"2"	       0x0032 153 445 202 470            
-"3"	       0x0033 258 435 260 448 243 461 215 462 207 452 218 438 248 431  
-"4"	       0x0034 138 470 149 484 142 494 120 495 102 488 95 475 99 468 121 465
-"5"	       0x0035 153 477 202 502            
-"6"	       0x0036 258 467 260 480 243 493 215 494 207 484 218 470 248 463  
-"7"	       0x0037 138 502 149 516 142 526 120 527 102 520 95 507 99 500 121 497
-"8"	       0x0038 153 509 202 534            
-"9"	       0x0039 258 499 260 512 243 525 215 526 207 516 218 502 248 495  
-"*"	       0x002a 138 534 149 548 142 558 120 559 102 552 95 539 99 532 121 529
-"0"	       0x0030 153 542 202 567            
-"#"	       0x0023 258 532 260 545 243 558 215 559 207 549 218 535 248 528  
-"Yes"	       0x01010001 91 343 141 393            
-"No"           0x01010002 219 343 269 393            
-"Select"       0x01010000 160 356 195 389            
-"Left"	       0x1000012 159 356 149 346 141 354 141 391 149 399 159 389 159 387  
-"Down"	       0x1000015 160 391 150 400 159 409 199 409 207 403 196 392 194 392  
-"Right"	       0x1000014 195 354 206 341 215 356 215 391 208 402 197 393    
-"Up"	       0x1000013 160 354 149 344 158 337 197 337 203 340 194 355    
diff --git a/tools/qvfb/SmartPhone2.skin/defaultbuttons.conf b/tools/qvfb/SmartPhone2.skin/defaultbuttons.conf
deleted file mode 100644
index b083203..0000000
--- a/tools/qvfb/SmartPhone2.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-[Button]
-[IMethod]
-key_count = 5
-key_hold_action_1 = insertText
-key_hold_action_2 = insertText
-key_hold_action_3 = insertSymbol
-key_hold_action_4 = changeMode
-key_hold_arg_1 = 1
-key_hold_arg_2 = 0
-key_id_1 = 1
-key_id_2 = 0
-key_id_3 = *
-key_id_4 = #
-key_id_5 = *
-key_mode_1 = Abc
-key_mode_2 = Abc
-key_mode_3 = Abc
-key_mode_4 = Abc
-key_mode_5 = Phone
-key_tap_action_1 = insertText
-key_tap_action_2 = insertSpace
-key_tap_action_3 = modifyText
-key_tap_action_4 = changeShift
-key_tap_action_5 = insertText
-key_tap_arg_1 = .,'?!-@:〓
-key_tap_arg_5 = *+pw
-[Menu]
-1 = Applications/camera.desktop
-2 = Applications/datebook.desktop
-3 = Games
-4 = Applications/qtmail.desktop
-5 = Applications/addressbook.desktop
-6 = Settings
-7 = Settings/Beaming.desktop
-8 = Applications
-9 = Documents
-Columns = 3
-Default = 5
-Map = 123456789
-Rows = 3
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-[SystemButtons]
-Count=5
-Key0=Yes
-Key1=Select
-Key2=No
-Key3=Menu
-Key4=Backspace
-[Device]
-PrimaryInput=Keypad
diff --git a/tools/qvfb/SmartPhoneWithButtons.qrc b/tools/qvfb/SmartPhoneWithButtons.qrc
deleted file mode 100644
index f3393ba..0000000
--- a/tools/qvfb/SmartPhoneWithButtons.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>SmartPhoneWithButtons.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png b/tools/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png
deleted file mode 100644
index 456a068..0000000
--- a/tools/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png
+++ /dev/null
diff --git a/tools/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png b/tools/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png
deleted file mode 100644
index 5ffbd6e..0000000
--- a/tools/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png
+++ /dev/null
diff --git a/tools/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin b/tools/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin
deleted file mode 100644
index 9afa67f..0000000
--- a/tools/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin
+++ /dev/null
@@ -1,31 +0,0 @@
-[SkinFile]
-Up=SmartPhoneWithButtons.png
-Down=SmartPhoneWithButtons-pressed.png
-Screen=90 107 176 208
-Areas=24
-HasMouseHover=false
-
-"1"        0x0031 138 459 149 473 142 483 120 484 102 477 95 464 99 457 121 454
-"2"        0x0032 153 467 202 492
-"3"        0x0033 258 457 260 470 243 483 215 484 207 474 218 460 248 453
-"4"        0x0034 138 492 149 506 142 516 120 517 102 510 95 497 99 490 121 487
-"5"        0x0035 153 499 202 524
-"6"        0x0036 258 489 260 502 243 515 215 516 207 506 218 492 248 485
-"7"        0x0037 138 524 149 538 142 548 120 549 102 542 95 529 99 522 121 519
-"8"        0x0038 153 531 202 556
-"9"        0x0039 258 521 260 534 243 547 215 548 207 538 218 524 248 517
-"*"        0x002a 138 556 149 570 142 580 120 581 102 574 95 561 99 554 121 551
-"0"        0x0030 153 564 202 589
-"#"        0x0023 258 554 260 567 243 580 215 581 207 571 218 557 248 550
-"Call"     0x01100004  88 395 130 439
-"Hangup"   0x01100005 227 395 269 439
-"Context1" 0x01100000 145 321 134 333 132 361 134 374 110 343 109 318
-"Back"     0x01000061 249 322 240 354 219 373 223 344 216 325 208 318
-"Select"   0x01010000 160 338 195 371
-"Left"     0x1000012 159 338 149 328 141 336 141 373 149 381 159 371 159 369
-"Down"     0x1000015 160 373 150 382 159 391 199 391 207 385 196 374 194 374
-"Right"    0x1000014 195 336 206 323 215 338 215 373 208 384 197 375
-"Up"       0x1000013 160 336 149 326 158 319 197 319 203 322 194 337
-"Home"     0x1000010 164 402 195 434
-"F1"       0x1000030 138 422 163 448
-"F2"       0x1000031 196 422 220 448
diff --git a/tools/qvfb/SmartPhoneWithButtons.skin/defaultbuttons.conf b/tools/qvfb/SmartPhoneWithButtons.skin/defaultbuttons.conf
deleted file mode 100644
index ebd6926..0000000
--- a/tools/qvfb/SmartPhoneWithButtons.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Button]
-Count=3
-[Button0]
-Name[]=Calendar Button
-Key=F1
-PressedActionService=Calendar
-PressedActionMessage=raiseToday()
-HeldActionService=Calendar
-HeldActionMessage=newEvent()
-[Button1]
-Name[]=Tasks Button
-Key=F2
-PressedActionService=Tasks
-PressedActionMessage=raise()
-HeldActionService=Tasks
-HeldActionMessage=newTask()
-[Button2]
-Name[]=Home Button
-Key=Home
-PressedActionMappable=0
-PressedActionService=TaskManager
-PressedActionMessage=multitask()
-HeldActionMappable=0
-HeldActionService=TaskManager
-HeldActionMessage=showRunningTasks()
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/datebook.desktop
-3=Applications
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Games
-7=Settings/Beaming.desktop
-8=Applications/simapp.desktop,Applications/calculator.desktop
-9=Settings
-*=Applications/mediarecorder.desktop
-0=Applications/todolist.desktop
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Select
-Key2=Back
-Key3=Call
-Key4=Hangup
-[TextButtons]
-Buttons=0123456789*#
-Hold0='0
-Hold1='1
-Hold2='2
-Hold3='3
-Hold4='4
-Hold5='5
-Hold6='6
-Hold7='7
-Hold8='8
-Hold9='9
-Hold*=symbol
-Hold#=mode
-Tap0=space
-Tap1="\".,'?!-@:1"
-Tap2="\"a\xe4\xe5\xe6\xe0\xe1\xe2\x62\x63\xe7\x32"
-Tap3="\"de\xe8\xe9\xea\x66\x33"
-Tap4="\"ghi\xec\xed\xee\x34"
-Tap5="\"jkl5"
-Tap6="\"mn\xf1o\xf6\xf8\xf2\xf3\x36"
-Tap7="\"pqrs\xdf\x37"
-Tap8="\"tu\xfc\xf9\xfav8"
-Tap9="\"wxyz9"
-Tap*=modify
-Tap#=shift
-[LocaleTextButtons]
-Buttons=23456789
-Tap2[]='abc
-Tap3[]='def
-Tap4[]='ghi
-Tap5[]='jkl
-Tap6[]='mno
-Tap7[]='pqrs
-Tap8[]='tuv
-Tap9[]='wxyz
-[PhoneTextButtons]
-Buttons=*#
-Tap*='*+pw
-Hold*=+
-Tap#='#
-Hold#=mode
-[Device]
-PrimaryInput=Keypad
diff --git a/tools/qvfb/TouchscreenPhone.qrc b/tools/qvfb/TouchscreenPhone.qrc
deleted file mode 100644
index 023144d..0000000
--- a/tools/qvfb/TouchscreenPhone.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>TouchscreenPhone.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/TouchscreenPhone.skin/TouchscreenPhone-pressed.png b/tools/qvfb/TouchscreenPhone.skin/TouchscreenPhone-pressed.png
deleted file mode 100644
index 01acb86..0000000
--- a/tools/qvfb/TouchscreenPhone.skin/TouchscreenPhone-pressed.png
+++ /dev/null
diff --git a/tools/qvfb/TouchscreenPhone.skin/TouchscreenPhone.png b/tools/qvfb/TouchscreenPhone.skin/TouchscreenPhone.png
deleted file mode 100644
index e90de0d..0000000
--- a/tools/qvfb/TouchscreenPhone.skin/TouchscreenPhone.png
+++ /dev/null
diff --git a/tools/qvfb/TouchscreenPhone.skin/TouchscreenPhone.skin b/tools/qvfb/TouchscreenPhone.skin/TouchscreenPhone.skin
deleted file mode 100644
index 24316a1..0000000
--- a/tools/qvfb/TouchscreenPhone.skin/TouchscreenPhone.skin
+++ /dev/null
@@ -1,16 +0,0 @@
-[SkinFile]
-Up=TouchscreenPhone.png
-Down=TouchscreenPhone-pressed.png
-Screen=90 107 176 208
-Areas=9
-HasMouseHover=false
-
-"Context1"   0x01100000  145 321 134 333 132 361 134 374 110 343 109 318
-"Call"	     0x01100004   88 395 130 439
-"Hangup"     0x01100005  227 395 269 439
-"Back"	     0x01000061  249 322 240 354 219 373 223 344 216 325 208 318
-"Left"	     0x1000012  159 338 149 328 141 336 141 373 149 381 159 371 159 369
-"Down"	     0x1000015  160 373 150 382 159 391 199 391 207 385 196 374 194 374
-"Right"	     0x1000014  195 336 206 323 215 338 215 373 208 384 197 375
-"Up"	     0x1000013  160 336 149 326 158 319 197 319 203 322 194 337
-"Select"     0x01010000  160 338 195 371
diff --git a/tools/qvfb/TouchscreenPhone.skin/defaultbuttons.conf b/tools/qvfb/TouchscreenPhone.skin/defaultbuttons.conf
deleted file mode 100644
index a13dfdc..0000000
--- a/tools/qvfb/TouchscreenPhone.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/datebook.desktop
-3=Applications
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Games
-7=Settings/Beaming.desktop
-8=Applications/simapp.desktop,Applications/calculator.desktop
-9=Settings
-*=Applications/mediarecorder.desktop
-0=Applications/todolist.desktop
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Back
-Key2=Select
-Key3=Call
-Key4=Hangup
-[Button]
-Count=1
-[Button0]
-Name=Power Button
-Key=Hangup
-HeldActionService=Launcher
-HeldActionMessage=execute(QString)
-HeldActionArgs=@ByteArray(\0\0\0\x1\0\0\0\n\0\0\0\0\x10\0s\0h\0u\0t\0\x64\0o\0w\0n)
-[Device]
-PrimaryInput=Touchscreen
-
diff --git a/tools/qvfb/Trolltech-Keypad.qrc b/tools/qvfb/Trolltech-Keypad.qrc
deleted file mode 100644
index 4775068..0000000
--- a/tools/qvfb/Trolltech-Keypad.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>Trolltech-Keypad.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png b/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png
deleted file mode 100644
index 8dd5719..0000000
--- a/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png
+++ /dev/null
diff --git a/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-down.png b/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-down.png
deleted file mode 100644
index 5e1e6be..0000000
--- a/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-down.png
+++ /dev/null
diff --git a/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.png b/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.png
deleted file mode 100644
index fb3d549..0000000
--- a/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.png
+++ /dev/null
diff --git a/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.skin b/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.skin
deleted file mode 100644
index 4d90321..0000000
--- a/tools/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.skin
+++ /dev/null
@@ -1,35 +0,0 @@
-[SkinFile]
-Up=Trolltech-Keypad.png
-Down=Trolltech-Keypad-down.png
-Closed=Trolltech-Keypad-closed.png
-ClosedAreas=F1 F2 F3 Flip
-ClosedScreen=95 456 128 96
-Screen=75 85 176 220
-Areas=25
-HasMouseHover=false
-"1"        0x0031 65 542 68 536 76 532 114 536 114 573 64 568
-"2"        0x0032 133 537 188 574
-"3"        0x0033 206 536 246 532 252 536 256 542 258 569 205 572
-"4"        0x0034 64 578 114 618
-"5"        0x0035 133 581 188 618
-"6"        0x0036 206 580 256 577 258 613 206 616
-"7"        0x0037 66 622 116 625 114 662 66 658
-"8"        0x0038 133 626 188 662
-"9"        0x0039 206 625 256 622 256 658 206 661
-"*"        0x002a 68 667 116 670 114 705 86 699 76 693 69 686
-"0"        0x0030 133 671 188 708
-"#"        0x0023 206 670 254 665 254 684 245 692 232 699 206 704
-"Context1" 0x01100000 69 420 75 410 85 404 101 404 102 458 69 458
-"Back"     0x01000061 218 404 234 404 240 408 248 418 248 456 218 457
-"Home"     0x1000010 140 494 180 514
-"Hangup"   0x01100005 218 457 248 456 248 496 243 507 230 514 194 514 194 494 206 492 213 486 218 478
-"Call"     0x01100004 68 458 102 460 102 479 108 487 118 492 126 494 126 514 86 514 77 507 72 496
-"Select"   0x01010000 138 426 182 458
-"Up"       0x1000013 118 406 201 402 184 423 134 422
-"Right"    0x1000014 184 424 201 402 202 476 184 460
-"Down"     0x1000015 135 462 184 461 199 477 118 477
-"Left"     0x1000012 118 406 134 424 134 461 117 476
-"F1"       0x1000030 0 408 45 456
-"F2"       0x1000031 0 456 45 509
-"F3"       0x1000032 0 545 45 582
-"Flip"     0x1100006 32 353 293 386
diff --git a/tools/qvfb/Trolltech-Keypad.skin/defaultbuttons.conf b/tools/qvfb/Trolltech-Keypad.skin/defaultbuttons.conf
deleted file mode 100644
index 6a78e67..0000000
--- a/tools/qvfb/Trolltech-Keypad.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,142 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Button]
-Count=8
-[Button7]
-Name[]=Home Down Button
-Key=Down
-Context=HomeScreen
-PressedActionMappable=0
-HeldActionService=Messaging
-HeldActionMessage=raise()
-[Button6]
-Name[]=Home Up Button
-Key=Up
-Context=HomeScreen
-PressedActionMappable=0
-HeldActionService=Contacts
-HeldActionMessage=raise()
-[Button5]
-Name[]=Home Right Button
-Key=Right
-Context=HomeScreen
-PressedActionMappable=0
-HeldActionService=mediaplayer
-HeldActionMessage=raise()
-[Button4]
-Name[]=Calender Button
-Key=Left
-Context=HomeScreen
-PressedActionMappable=0
-HeldActionService=Calendar
-HeldActionMessage=raiseToday()
-[Button3]
-Name[]=Left Soft Key
-Key=Context1
-HeldActionService=TaskManager
-HeldActionMessage=showRunningTasks()
-HeldActionMappable=0
-PressActionMappable=0
-[Button2]
-Name[]=VoiceNotes Button
-Key=F1
-PressedActionService=mediarecorder
-PressedActionMessage=raise()
-HeldActionService=mediarecorder
-HeldActionMessage=newEvent()
-[Button1]
-Name[]=Camera Button
-Key=F2
-PressedActionService=Camera
-PressedActionMessage=raise()
-HeldActionService=Tasks
-HeldActionMessage=newTask()
-[Button0]
-Name[]=Home Button
-Key=Home
-PressedActionMappable=0
-PressedActionService=TaskManager
-PressedActionMessage=multitask()
-HeldActionMappable=0
-HeldActionService=TaskManager
-HeldActionMessage=showRunningTasks()
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/mediaplayer.desktop
-3=Applications/simapp.desktop,Applications/calculator.desktop
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Applications/datebook.desktop
-7=Games
-8=Settings/Beaming.desktop
-9=Applications/todolist.desktop
-*=Settings
-0=Applications
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=6
-Key0=Context1
-Key1=Select
-Key2=Back
-Key3=Call
-Key4=Hangup
-Key5=Flip
-[TextButtons]
-Buttons=0123456789*#
-Hold0='0
-Hold1='1
-Hold2='2
-Hold3='3
-Hold4='4
-Hold5='5
-Hold6='6
-Hold7='7
-Hold8='8
-Hold9='9
-Hold*=symbol
-Hold#=mode
-Tap0=space
-Tap0=space
-Tap1="\".,'?!-@:1"
-Tap2="\"a\xe4\xe5\xe6\xe0\xe1\xe2\x62\x63\xe7\x32"
-Tap3="\"de\xe8\xe9\xea\x66\x33"
-Tap4="\"ghi\xec\xed\xee\x34"
-Tap5="\"jkl5"
-Tap6="\"mn\xf1o\xf6\xf8\xf2\xf3\x36"
-Tap7="\"pqrs\xdf\x37"
-Tap8="\"tu\xfc\xf9\xfav8"
-Tap9="\"wxyz9"
-Tap*=modify
-Tap#=shift
-[LocaleTextButtons]
-Buttons=23456789
-Tap2[]='abc
-Tap3[]='def
-Tap4[]='ghi
-Tap5[]='jkl
-Tap6[]='mno
-Tap7[]='pqrs
-Tap8[]='tuv
-Tap9[]='wxyz
-[PhoneTextButtons]
-Buttons=*#
-Tap*='*+pw
-Hold*=+
-Tap#='#
-Hold#=mode
-[Device]
-PrimaryInput=Keypad
-[Environment]
-QWS_DISPLAY=Multi: LinuxFb:mmHeight57:0 LinuxFb:offset=0,320:1 :0
diff --git a/tools/qvfb/Trolltech-Touchscreen.qrc b/tools/qvfb/Trolltech-Touchscreen.qrc
deleted file mode 100644
index 40fafeb..0000000
--- a/tools/qvfb/Trolltech-Touchscreen.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>Trolltech-Touchscreen.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png b/tools/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png
deleted file mode 100644
index c1a422f..0000000
--- a/tools/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png
+++ /dev/null
diff --git a/tools/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png b/tools/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png
deleted file mode 100644
index 544a425..0000000
--- a/tools/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png
+++ /dev/null
diff --git a/tools/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin b/tools/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin
deleted file mode 100644
index 5de882e..0000000
--- a/tools/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin
+++ /dev/null
@@ -1,17 +0,0 @@
-[SkinFile]
-Up=Trolltech-Touchscreen.png
-Down=Trolltech-Touchscreen-down.png
-Screen=40 109 176 220
-Areas=10
-HasMouseHover=false
-
-"Context1"   0x01100000 38 420 44 408 52 404 68 403 68 458 40 458 
-"Back"       0x01000061 185 42 202 398 211 410 216 418 219 456 186 456
-"Call"	     0x01100004 38 458 70 458 71 478 75 486 83 492 94 494 94 516 56 516 45 507 38 498  
-"Hangup"     0x01100005 186 458 220 458 220 496 214 508 200 516 162 516 161 494 172 492 180 486 185 478
-"Left"	     0x1000012  86 405 106 426 106 461 85 478 
-"Down"	     0x1000015  106 460 151 460 170 480 85 480
-"Right"	     0x1000014  151 424 170 404 170 480 151 460
-"Up"	     0x1000013  85 403 168 403 150 424 106 424 
-"Select"     0x01010000  106 426 150 456
-"Home"       0x1000010   105 493 145 512
diff --git a/tools/qvfb/Trolltech-Touchscreen.skin/defaultbuttons.conf b/tools/qvfb/Trolltech-Touchscreen.skin/defaultbuttons.conf
deleted file mode 100644
index 6665125..0000000
--- a/tools/qvfb/Trolltech-Touchscreen.skin/defaultbuttons.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-[Translation]
-File=QtopiaDefaults
-Context=Buttons
-[Menu]
-Rows=4
-Columns=3
-Map=123456789*0#
-Default=5
-1=Applications/camera.desktop
-2=Applications/mediaplayer.desktop
-3=Applications/simapp.desktop,Applications/calculator.desktop
-4=Applications/qtmail.desktop
-5=Applications/addressbook.desktop
-6=Applications/datebook.desktop
-7=Games
-8=Settings/beaming.desktop
-9=Applications/todolist.desktop
-*=Settings
-0=Applications
-#=Documents
-Animator=Bounce
-AnimatorBackground=Radial
-[SoftKeys]
-Count=3
-Key0=Context1
-Key1=Select
-Key2=Back
-[SystemButtons]
-Count=5
-Key0=Context1
-Key1=Back
-Key2=Select
-Key3=Call
-Key4=Hangup
-[Device]
-PrimaryInput=Touchscreen
-[Button]
-Count=2
-[Button0]
-Name[]=Home Button
-Key=Home
-PressedActionMappable=0
-PressedActionService=TaskManager
-PressedActionMessage=multitask()
-HeldActionMappable=0
-HeldActionService=TaskManager
-HeldActionMessage=showRunningTasks()
-[Button1]
-Name=Power Button
-Key=Hangup
-HeldActionService=Launcher
-HeldActionMessage=execute(QString)
-HeldActionArgs=@ByteArray(\0\0\0\x1\0\0\0\n\0\0\0\0\x10\0s\0h\0u\0t\0\x64\0o\0w\0n)
diff --git a/tools/qvfb/pda.qrc b/tools/qvfb/pda.qrc
deleted file mode 100644
index b14e7b3..0000000
--- a/tools/qvfb/pda.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/skins">
-    <file>pda.skin</file>
-</qresource>
-</RCC>
diff --git a/tools/qvfb/pda.skin b/tools/qvfb/pda.skin
deleted file mode 100644
index 037f750..0000000
--- a/tools/qvfb/pda.skin
+++ /dev/null
@@ -1,14 +0,0 @@
-pda_up.png pda_down.png
-57 81
-240 320
-11
-"Power"  0x0100000a  277  36 302  57
-"F1"     0x01000030   52 439  81 470
-"F2"     0x01000031  101 422 130 451
-"F3"     0x01000032  232 423 260 452
-"F4"     0x01000033  279 445 309 473
-"Left"   0x01000012  155 438 176 472
-"Down"   0x01000015  169 471 203 486
-"Right"  0x01000014  193 448 215 472
-"Up"     0x01000013  166 427 199 451
-"Enter"  0x01000005  177 448 193 468
diff --git a/tools/qvfb/pda_down.png b/tools/qvfb/pda_down.png
deleted file mode 100644
index 0ea157d..0000000
--- a/tools/qvfb/pda_down.png
+++ /dev/null
diff --git a/tools/qvfb/pda_up.png b/tools/qvfb/pda_up.png
deleted file mode 100644
index 541e3c4..0000000
--- a/tools/qvfb/pda_up.png
+++ /dev/null
diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro
index 85c4d96..247337a 100644
--- a/tools/qvfb/qvfb.pro
+++ b/tools/qvfb/qvfb.pro
@@ -60,15 +60,4 @@ unix:x11 {
     LIBS += -lXtst
 }
 
-RESOURCES	+= qvfb.qrc \
-                   ClamshellPhone.qrc \
-                   PDAPhone.qrc \
-                   SmartPhone2.qrc \
-                   SmartPhone.qrc \
-                   SmartPhoneWithButtons.qrc \
-                   TouchscreenPhone.qrc \
-                   Trolltech-Keypad.qrc \
-                   Trolltech-Touchscreen.qrc \
-                   PortableMedia.qrc \
-                   S60-QVGA-Candybar.qrc \
-                   S60-nHD-Touchscreen.qrc
+RESOURCES	+= qvfb.qrc