Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
  Added default countries for Mongolian and Nepali.
  Updated tst_qlocale autotest.
  Updated the 4.7.0 change log with my changes.
  Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 )
  doc: Fixed many broken links.
  doc: Fixed many broken links.
  doc: Fixed many broken links.
  qdoc: Set back to 3 cols for class list; we have a scrollbar now.
  Fix build on Mac OS X and Windows.
  Remove obsolete and broken qvfb skins.
  Only setup ICD test data when ICD is enabled.
  Doc: Fixed two diagrams and finally committed images for them.
  Make sure cursorPositionChanged is emitted when doing undo/redo
  Some more 4.7.0 changes
  Fix cosmetic issue in designer filter edits
  Doc: Adding support for IE 6, 7 and 8
  doc: Updated the widgets tutorial to work without page links.
  My 4.7.0 changes
  Added support for es_419 locale.
  Added Korean and Nynorsk locales support on Symbian.
  ...

35 files changed, 48 insertions, 434 deletions

diff --git a/tools/designer/src/lib/sdk/abstractformeditor.cpp b/tools/designer/src/lib/sdk/abstractformeditor.cpp
index 5353cab..c301f46 100644
--- a/tools/designer/src/lib/sdk/abstractformeditor.cpp
+++ b/tools/designer/src/lib/sdk/abstractformeditor.cpp
@@ -71,7 +71,6 @@ static void initResources()
 {
     Q_INIT_RESOURCE(shared);
     Q_INIT_RESOURCE(ClamshellPhone);
-    Q_INIT_RESOURCE(PDAPhone);
     Q_INIT_RESOURCE(PortableMedia);
     Q_INIT_RESOURCE(S60_nHD_Touchscreen);
     Q_INIT_RESOURCE(S60_QVGA_Candybar);
@@ -79,8 +78,6 @@ static void initResources()
     Q_INIT_RESOURCE(SmartPhone);
     Q_INIT_RESOURCE(SmartPhoneWithButtons);
     Q_INIT_RESOURCE(TouchscreenPhone);
-    Q_INIT_RESOURCE(Trolltech_Keypad);
-    Q_INIT_RESOURCE(Trolltech_Touchscreen);
 }
 
 QT_BEGIN_NAMESPACE
diff --git a/tools/designer/src/lib/shared/filterwidget.cpp b/tools/designer/src/lib/shared/filterwidget.cpp
index 9363b7c..a501c02 100644
--- a/tools/designer/src/lib/shared/filterwidget.cpp
+++ b/tools/designer/src/lib/shared/filterwidget.cpp
@@ -163,7 +163,7 @@ FilterWidget::FilterWidget(QWidget *parent, LayoutMode lm)  :
     m_editor->setPlaceholderText(tr("Filter"));
 
     // Let the style determine minimum height for our widget
-    QSize size(ICONBUTTON_SIZE + 2, ICONBUTTON_SIZE + 2);
+    QSize size(ICONBUTTON_SIZE + 6, ICONBUTTON_SIZE + 2);
 
     // Note KDE does not reserve space for the highlight color
     if (style()->inherits("OxygenStyle")) {
diff --git a/tools/designer/src/lib/shared/previewconfigurationwidget.cpp b/tools/designer/src/lib/shared/previewconfigurationwidget.cpp
index e07d155..d116d58 100644
--- a/tools/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/tools/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -41,7 +41,7 @@
 
 /* It is possible to link the skins as resources into Designer by specifying:
  * QVFB_ROOT=$$QT_SOURCE_TREE/tools/qvfb
- * RESOURCES += $$QVFB_ROOT/ClamshellPhone.qrc  $$QVFB_ROOT/PDAPhone.qrc ...
+ * RESOURCES += $$QVFB_ROOT/ClamshellPhone.qrc  $$QVFB_ROOT/TouchScreenPhone.qrc ...
  * in lib/shared/shared.pri. However, this exceeds a limit of Visual Studio 6. */
 
 #include "previewconfigurationwidget_p.h"
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 5495e34..dda2cf3 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1801,6 +1801,21 @@ void HtmlGenerator::generateHeader(const QString& title,
 
     out() << "  <title>" << shortVersion << protectEnc(title) << "</title>\n";
 
+	out() << "  <!--[if IE]>";
+	out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">";
+	out() << "<meta http-equiv=\"imagetoolbar\" content=\"no\">";
+	out() << "<![endif]-->";
+    out() << "<!--[if lt IE 7]>";
+	out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">";
+	out() << "<![endif]-->";
+    out() << "<!--[if IE 7]>";
+	out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">";
+	out() << "<![endif]-->";
+    out() << "<!--[if IE 8]>";
+	out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">";
+	out() << "<![endif]-->";
+
+
     //out() << "  <title>Qt Reference Documentation</title>";
     out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n";
     out() << "  <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n";
@@ -2317,7 +2332,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                                         QString commonPrefix)
 {
     const int NumParagraphs = 37; // '0' to '9', 'A' to 'Z', '_'
-    const int NumColumns = 2; // number of columns in the result
+    const int NumColumns = 3; // number of columns in the result
 
     if (classMap.isEmpty())
         return;
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 112b1b2..3711ec4 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -36,6 +36,9 @@ qhp.Assistant.extraFiles          = 									images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.Assistant.filterAttributes    = qt 4.7.0 tools assistant
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index d4da292..39da68b 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -36,6 +36,9 @@ qhp.Designer.extraFiles          = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.Designer.filterAttributes    = qt 4.7.0 tools designer
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index 7420b4f..dba4fb5 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -36,6 +36,9 @@ qhp.Linguist.extraFiles          = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.Linguist.filterAttributes    = qt 4.7.0 tools linguist
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 8015f57..f744879 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -47,6 +47,9 @@ qhp.Qml.extraFiles            = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.Qml.filterAttributes    = qt 4.6.0 qtrefdoc
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index 49d088e..b7f4115 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -36,6 +36,9 @@ qhp.qmake.extraFiles          = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.qmake.filterAttributes    = qt 4.7.0 tools qmake
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index f0c2535..d3c855f 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -42,6 +42,9 @@ qhp.Qt.extraFiles          = index.html \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+								    style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index a00d5a1..e9bc00c 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -50,7 +50,10 @@ qhp.Qt.extraFiles          = index.html \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
-                             	    style/style.css
+                             	    style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
+									style/style.css
 
 language                = Cpp
 
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 9af2f92..e83e666 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -1,4 +1,8 @@
-HTML.stylesheets        = style/style.css
+HTML.stylesheets        =  style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
+									style/style.css
+									
 HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    <div id=\"nav-logo\">\n" \
 			  "      <a href=\"index.html\">Home</a></div>\n" \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 2f6983a..83a35a9 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -46,6 +46,9 @@ qhp.Qt.extraFiles          = index.html \
 			     images/dynamiclayouts-example.png \
 			     scripts/functions.js \
 			     scripts/jquery.js \
+			     style/style_ie6.css \
+			     style/style_ie7.css \
+			     style/style_ie8.css \
 			     style/style.css
 
 qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc
diff --git a/tools/shared/deviceskin/deviceskin.pri b/tools/shared/deviceskin/deviceskin.pri
index 2552c92..3e9935a 100644
--- a/tools/shared/deviceskin/deviceskin.pri
+++ b/tools/shared/deviceskin/deviceskin.pri
@@ -2,13 +2,10 @@ INCLUDEPATH += $$PWD
 HEADERS += $$PWD/deviceskin.h
 SOURCES += $$PWD/deviceskin.cpp
 RESOURCES += $$PWD/skins/ClamshellPhone.qrc \
-    $$PWD/skins/PDAPhone.qrc \
     $$PWD/skins/SmartPhone2.qrc \
     $$PWD/skins/SmartPhone.qrc \
     $$PWD/skins/SmartPhoneWithButtons.qrc \
     $$PWD/skins/TouchscreenPhone.qrc \
-    $$PWD/skins/Trolltech-Keypad.qrc \
-    $$PWD/skins/Trolltech-Touchscreen.qrc \
     $$PWD/skins/PortableMedia.qrc \
     $$PWD/skins/S60-QVGA-Candybar.qrc \
     $$PWD/skins/S60-nHD-Touchscreen.qrc
diff --git a/tools/shared/deviceskin/skins/DualScreenPhone.skin/DualScreen-pressed.png b/tools/shared/deviceskin/skins/DualScreenPhone.skin/DualScreen-pressed.png
deleted file mode 100644
index d62ef4a..0000000
--- a/tools/shared/deviceskin/skins/DualScreenPhone.skin/DualScreen-pressed.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/DualScreenPhone.skin/DualScreen.png b/tools/shared/deviceskin/skins/DualScreenPhone.skin/DualScreen.png
deleted file mode 100644
index cb3d1a7..0000000
--- a/tools/shared/deviceskin/skins/DualScreenPhone.skin/DualScreen.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/DualScreenPhone.skin/DualScreenPhone.skin b/tools/shared/deviceskin/skins/DualScreenPhone.skin/DualScreenPhone.skin
deleted file mode 100644
index a82ef23..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/DualScreenPhone.skin/defaultbuttons.conf b/tools/shared/deviceskin/skins/DualScreenPhone.skin/defaultbuttons.conf
deleted file mode 100644
index 1103350..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/PDAPhone.qrc b/tools/shared/deviceskin/skins/PDAPhone.qrc
deleted file mode 100644
index 1a1c35a..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/PDAPhone.skin/PDAPhone.skin b/tools/shared/deviceskin/skins/PDAPhone.skin/PDAPhone.skin
deleted file mode 100644
index d6a1966..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/PDAPhone.skin/defaultbuttons.conf b/tools/shared/deviceskin/skins/PDAPhone.skin/defaultbuttons.conf
deleted file mode 100644
index e3ae813..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/PDAPhone.skin/finger.png b/tools/shared/deviceskin/skins/PDAPhone.skin/finger.png
deleted file mode 100644
index 24cf0cb..0000000
--- a/tools/shared/deviceskin/skins/PDAPhone.skin/finger.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/PDAPhone.skin/pda_down.png b/tools/shared/deviceskin/skins/PDAPhone.skin/pda_down.png
deleted file mode 100644
index f65c059..0000000
--- a/tools/shared/deviceskin/skins/PDAPhone.skin/pda_down.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/PDAPhone.skin/pda_up.png b/tools/shared/deviceskin/skins/PDAPhone.skin/pda_up.png
deleted file mode 100644
index 541e3c4..0000000
--- a/tools/shared/deviceskin/skins/PDAPhone.skin/pda_up.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/Trolltech-Keypad.qrc b/tools/shared/deviceskin/skins/Trolltech-Keypad.qrc
deleted file mode 100644
index 4775068..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png b/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png
deleted file mode 100644
index 8dd5719..0000000
--- a/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad-down.png b/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad-down.png
deleted file mode 100644
index 5e1e6be..0000000
--- a/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad-down.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad.png b/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad.png
deleted file mode 100644
index fb3d549..0000000
--- a/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad.skin b/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/Trolltech-Keypad.skin
deleted file mode 100644
index 4d90321..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/Trolltech-Keypad.skin/defaultbuttons.conf b/tools/shared/deviceskin/skins/Trolltech-Keypad.skin/defaultbuttons.conf
deleted file mode 100644
index 6a78e67..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/Trolltech-Touchscreen.qrc b/tools/shared/deviceskin/skins/Trolltech-Touchscreen.qrc
deleted file mode 100644
index 40fafeb..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png b/tools/shared/deviceskin/skins/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png
deleted file mode 100644
index c1a422f..0000000
--- a/tools/shared/deviceskin/skins/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png b/tools/shared/deviceskin/skins/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png
deleted file mode 100644
index 544a425..0000000
--- a/tools/shared/deviceskin/skins/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png
+++ /dev/null
diff --git a/tools/shared/deviceskin/skins/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin b/tools/shared/deviceskin/skins/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin
deleted file mode 100644
index 5de882e..0000000
--- a/tools/shared/deviceskin/skins/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/shared/deviceskin/skins/Trolltech-Touchscreen.skin/defaultbuttons.conf b/tools/shared/deviceskin/skins/Trolltech-Touchscreen.skin/defaultbuttons.conf
deleted file mode 100644
index 6665125..0000000
--- a/tools/shared/deviceskin/skins/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)