From b0792a5c548c600443edbeaa3c4b0612e0eb4045 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Fri, 24 Sep 2010 09:25:26 +0200
Subject: Doc: Implementing new search display

---
 doc/src/template/scripts/functions.js       | 223 ++++++++++++++++------------
 tools/qdoc3/test/qt-html-templates.qdocconf |   9 +-
 2 files changed, 138 insertions(+), 94 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index faa4ca4..5bf8323 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -1,38 +1,57 @@
+// Removing search results
+function hideSearchResults() {
+  $('#resultdialog').removeClass('active');
+	$("#resultlist").removeClass().addClass('all');
+	$("#resultlinks").removeClass().addClass('all');
+	$("#searchcount").removeClass().addClass('all');
+}
+// Closing search result box
+$('#resultclose').click(function(e) {
+  e.preventDefault();
+  hideSearchResults();
+});
+
+$(document.body).click(function() {
+});
+
 /* START non link areas where cursor should change to pointing hand */
 $('.t_button').mouseover(function() {
     $('.t_button').css('cursor','pointer');
-		/*document.getElementById(this.id).style.cursor='pointer';*/
 });
 /* END non link areas  */
+// Font size small
 $('#smallA').click(function() {
-		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','smaller');
+		$('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('font-size','smaller');
 		$('.t_button').removeClass('active')
 		$(this).addClass('active')
 });
 
+// Font size reset
 $('#medA').click(function() {
-		$('.content .heading').css('font','600 16px/1 Arial');
-		$('.content h1').css('font','600 18px/1.2 Arial');
-		$('.content h2').css('font','600 16px/1.2 Arial');
-		$('.content h3').css('font','600 14px/1.2 Arial');
-		$('.content p').css('font','13px/20px Verdana');
-		$('.content li').css('font','400 13px/1 Verdana');
-		$('.content li').css('line-height','14px');
-		$('.content .toc li').css('font', 'normal 10px/1.2 Verdana');
-		$('.content table').css('font','13px/1.2 Verdana');
-		$('.content .heading').css('font','600 16px/1 Arial');
-		$('.content .indexboxcont li').css('font','600 13px/1 Verdana');
+		$('.mainContent .heading').css('font','600 16px/1 Arial');
+		$('.mainContent h1').css('font','600 18px/1.2 Arial');
+		$('.mainContent h2').css('font','600 16px/1.2 Arial');
+		$('.mainContent h3').css('font','600 14px/1.2 Arial');
+		$('.mainContent p').css('font','13px/20px Verdana');
+		$('.mainContent li').css('font','400 13px/1 Verdana');
+		$('.mainContent li').css('line-height','14px');
+		$('.mainContent .toc li').css('font', 'normal 10px/1.2 Verdana');
+		$('.mainContent table').css('font','13px/1.2 Verdana');
+		$('.mainContent .heading').css('font','600 16px/1 Arial');
+		$('.mainContent .indexboxcont li').css('font','600 13px/1 Verdana');
 		$('.t_button').removeClass('active')
 		$(this).addClass('active')
 });
 
+// Font size large
 $('#bigA').click(function() {
-		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','large');
-		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('line-height','25px');
+		$('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('font-size','large');
+		$('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('line-height','25px');
 		$('.t_button').removeClass('active')
 		$(this).addClass('active')
 });
 
+// Show page content after closing feedback box
 $('.feedclose').click(function() {
 	$('.bd').show();
 	$('.hd').show();
@@ -41,6 +60,7 @@ $('.feedclose').click(function() {
 	$('#blurpage').hide();
 });
 
+// Hide page content and show feedback box
 $('.feedback').click(function() {
 	$('.bd').hide();
 	$('.hd').hide();
@@ -48,71 +68,93 @@ $('.feedback').click(function() {
 	$('#feedbackBox').show();
 	$('#blurpage').show();
 });
-var lookupCount = 0;
-var articleCount = 0;
-var exampleCount = 0;
-var qturl = ""; // change from "http://doc.qt.nokia.com/4.6/" to 0 so we can have relative links
+// Setting URL - in this case relative to root
+var qturl = "";
+
+// Process data sent back from the server. The data is structured as a XML.
+/*
+XML structure handled by function processNokiaData()
+<page> - container for each page returned
+<pageWords/> - contains keywords
+<pageTitle/> - contains page title/header content 
+<pageUrl/> - contains page URL - URL relative to root
+<pageType> - contains page type - APIPage/Article/Example
+</page>
+*/
+
 
 function processNokiaData(response){
 	var propertyTags = response.getElementsByTagName('page');
 	
- 	for (var i=0; i< propertyTags.length; i++) {
-		var linkStart   = "<li class=\"liveResult\"><a href='"+qturl+"";
-		var linkEnd  = "</a></li>";
-		
-		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
-			lookupCount++;
-
-			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
-				full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
-				full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd;
-				$('#ul001').append(full_li_element);
-			$('#ul001 .defaultLink').css('display','none');
-
-		   		}
-			}
-	 
-		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
-			articleCount++;
-
-			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
-			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
-				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
-					
-				$('#ul002').append(full_li_element);
-			$('#ul002 .defaultLink').css('display','none');
-
-	   		}
-		}
-		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
-			exampleCount++;
-
-
-			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
-			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
-				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
-					
-				$('#ul003').append(full_li_element);
-			$('#ul003 .defaultLink').css('display','none');
-
-	   		}
-		} 
-		if(i==propertyTags.length){$('#pageType').removeClass('loading');}
-
-	}	
-	if(lookupCount > 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult hit\">Found ' + lookupCount + ' hits</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
-    if(articleCount > 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul002 li').css('display','block');}
-	if(exampleCount > 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul003 li').css('display','block');}
-	 
-	if(lookupCount == 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
-    if(articleCount == 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
-	if(exampleCount == 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
-	// reset count variables;
-	 lookupCount=0;
-	 articleCount = 0;
-     exampleCount = 0;
+	var apiCount = 0;
+	var articleCount = 0;
+	var exampleCount = 0;
 	
+	var full_li_element;
+
+	$('#resultlist li').remove();
+
+
+ 	for (var i=0; i<propertyTags.length; i++) {
+		for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++) {
+			full_li_element = '<li';
+      if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') {
+      	full_li_element += ' class="api"';
+      	apiCount++;
+      }
+      else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') {
+      	full_li_element += ' class="article"';
+      	articleCount++;
+      }
+      else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') {
+      	full_li_element += ' class="example"';
+      	exampleCount++;
+      }
+			full_li_element += '><a href="'+qturl;
+      full_li_element += propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
+      full_li_element += '">' + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + '</a></li>';
+      $('#resultlist').append(full_li_element);
+    }
+	}
+
+	if (propertyTags.length > 0) {
+	  $('#resultdialog').addClass('active');
+	  $('#resultcount').html(propertyTags.length);
+	  $('#apicount').html(apiCount);
+	  $('#articlecount').html(articleCount);
+	  $('#examplecount').html(exampleCount);
+  }
+
+  // Filtering results in display
+	$('p#resultlinks a').click(function(e) {
+  	e.preventDefault();
+	// Displays API ref pages
+		if (this.id == "showapiresults") {
+			$("#resultlist").removeClass().addClass('api');
+			$("#resultlinks").removeClass().addClass('api');
+			$("#searchcount").removeClass().addClass('api');
+		}
+	// Displays Articles
+		else if (this.id == "showarticleresults") {
+			$("#resultlist").removeClass().addClass('article');
+			$("#resultlinks").removeClass().addClass('article');
+			$("#searchcount").removeClass().addClass('article');
+		}
+	// Displays Examples
+		if (this.id == "showexampleresults") {
+			$("#resultlist").removeClass().addClass('example');
+			$("#resultlinks").removeClass().addClass('example');
+			$("#searchcount").removeClass().addClass('example');
+		}
+	// Displays All
+		if (this.id == "showallresults") {
+			$("#resultlist").removeClass().addClass('all');
+			$("#resultlinks").removeClass().addClass('all');
+			$("#searchcount").removeClass().addClass('all');
+		}
+	});
 }
+
 //build regular expression object to find empty string or any number of blank
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
@@ -129,27 +171,22 @@ function CheckEmptyAndLoadList()
 	var value = document.getElementById('pageType').value; 
 	if((blankRE.test(value)) || (value.length < 3))
 	{
-	//empty inputbox
-		// load default li elements into the ul if empty
-	//	loadAllList(); // replaced
+
+
+
 	 $('.defaultLink').css('display','block');
-	// $('.liveResult').css('display','none');
+
+	$('#resultdialog').removeClass('active');
+	$('#resultlist li').remove();
 	}else{
-	 $('.defaultLink').css('display','none');
+
 	}
 }
-/*
-$(window).resize(function(){
-if($(window).width()<400)
-	$('body').addClass('offline');
-else
-	$('body').removeClass('offline');
-	});
-	*/
-// Loads on doc ready
+
+// Loads on doc ready - prepares search 
 	$(document).ready(function () {
-	//alert(pageUrl);
-	//$('#pageUrl').attr('foo',pageUrl);
+
+
 	var pageTitle = $('title').html();
           var currentString = $('#pageType').val() ;
 		  if(currentString.length < 1){
@@ -165,14 +202,14 @@ else
 				 $('.searching').remove(); 
       	   		CheckEmptyAndLoadList();
 				$('.report').remove();
-				// debug$('.content').prepend('<li>too short or blank</li>'); // debug
+
 				return;
 		   }
             if (this.timer) clearTimeout(this.timer);
             this.timer = setTimeout(function () {
 				$('#pageType').addClass('loading');
 				$('.searching').remove(); 
-				$('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
+
                $.ajax({
                 contentType: "application/x-www-form-urlencoded",
                 url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
@@ -184,7 +221,7 @@ else
 				$('.liveResult').remove(); 
 				$('.searching').remove(); 
 				$('#pageType').removeClass('loading');
-				$('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
+
                 processNokiaData(response);
 
  }     
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 44aa918..0d6cb8d 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -71,6 +71,13 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
 			  "            <fieldset>\n" \
 			  "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
+			" <div id=\"resultdialog\"> \n" \
+			" <a href=\"#\" id=\"resultclose\">Close</a> \n" \
+			" <p id=\"resultlinks\" class=\"all\"><a href=\"#\" id=\"showallresults\">All</a> | <a href=\"#\" id=\"showapiresults\">API</a> | <a href=\"#\" id=\"showarticleresults\">Articles</a> | <a href=\"#\" id=\"showexampleresults\">Examples</a></p> \n" \
+			" <p id=\"searchcount\" class=\"all\"><span id=\"resultcount\"></span><span id=\"apicount\"></span><span id=\"articlecount\"></span><span id=\"examplecount\"></span>&nbsp;results:</p> \n" \
+			" <ul id=\"resultlist\" class=\"all\"> \n" \
+			" </ul> \n" \
+			" </div> \n" \
 			  "            </fieldset>\n" \
 			  "          </form>\n" \
 			  "        </div>\n" \
@@ -135,7 +142,7 @@ HTML.postpostheader     = "            </ul>\n" \
 			  "            </ul>\n" \
 			  "        </div>\n" \
 			  "        </div>\n" \
-			  "        <div class=\"content\">\n"
+			  "        <div class=\"content mainContent\">\n"
 
 HTML.footer             = "" \
 			  "        <div class=\"feedback t_button\">\n" \
-- 
cgit v0.12


From 38449f8700da5c673b95a394cf9b7543904cb10c Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@collabora.co.uk>
Date: Tue, 28 Sep 2010 00:03:43 +0300
Subject: Reference to QStringList::find() is incorrect, should be
 QStringList::filter().

Task-number: QTBUG-9248
---
 src/corelib/tools/qstring.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 5be885b..dba53af 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -565,7 +565,7 @@ const QString::Null QString::null = { };
     and join a list of strings into a single string with an optional
     separator using QStringList::join(). You can obtain a list of
     strings from a string list that contain a particular substring or
-    that match a particular QRegExp using the QStringList::find()
+    that match a particular QRegExp using the QStringList::filter()
     function.
 :
     \section1 Querying String Data
-- 
cgit v0.12


From 5b7c9baea08125a51e7ecb318e4579f0fe4eef0c Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@collabora.co.uk>
Date: Tue, 28 Sep 2010 00:04:34 +0300
Subject: Remove obsolete reference to qregexp.tex.

According to history, this file hasn't really been maintained since 3.x times, and
hasn't existed in the source tree for quite a while.
---
 src/corelib/tools/qregexp.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 36827d0..a8bf38f 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -74,10 +74,6 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
 #define RXERR_INTERVAL   QT_TRANSLATE_NOOP("QRegExp", "invalid interval")
 #define RXERR_CATEGORY   QT_TRANSLATE_NOOP("QRegExp", "invalid category")
 
-/*
-  WARNING! Be sure to read qregexp.tex before modifying this file.
-*/
-
 /*!
     \class QRegExp
     \reentrant
-- 
cgit v0.12


From 59949ff908995158462d456c14d4a3a10b19418e Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@collabora.co.uk>
Date: Tue, 28 Sep 2010 01:43:36 +0300
Subject: Fix a link that no longer exists in documentation.

Best to keep them up to date, even though that link isn't really used for
anything except to make a point.

Task-number: QTWEBSITE-13
---
 src/corelib/global/qnamespace.qdoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 5cd7f0e..87af61a 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -2767,7 +2767,7 @@
     \value ElideNone    Ellipsis should NOT appear in the text.
 
     Qt::ElideMiddle is normally the most appropriate choice for URLs (e.g.,
-    "\l{http://qt.nokia.com/careers/movingto/brisbane/}{http://qt.nok...ovingto/brisbane/}"),
+    "\l{http://bugreports.qt.nokia.com/browse/QTWEBSITE-13}{http://bugreports.qt.../QTWEBSITE-13/}"),
     whereas Qt::ElideRight is appropriate
     for other strings (e.g.,
     "\l{http://qt.nokia.com/doc/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}").
-- 
cgit v0.12


From a21b6be2e97b2678111930bc04eaa843b42fa22b Mon Sep 17 00:00:00 2001
From: Geir Vattekar <geir.vattekar@nokia.com>
Date: Tue, 28 Sep 2010 11:39:38 +0200
Subject: Doc: Added lisence header to snippet

---
 doc/src/snippets/widgetprinting.cpp | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/doc/src/snippets/widgetprinting.cpp b/doc/src/snippets/widgetprinting.cpp
index b3d5b7c..47839d8 100644
--- a/doc/src/snippets/widgetprinting.cpp
+++ b/doc/src/snippets/widgetprinting.cpp
@@ -1,3 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 
 #include <QtGui>
 
-- 
cgit v0.12


From d462d0af6fd4ad2fa21ab2f5364754fcb1a9af50 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Tue, 28 Sep 2010 11:45:59 +0200
Subject: Doc: fixing bugs in slim-fit style

---
 doc/src/template/style/narrow.css           |  6 +++---
 tools/qdoc3/test/qt-html-templates.qdocconf | 31 -----------------------------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index de5b0a0..00d28b9 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -6,7 +6,7 @@
     }
 
     .narrow a {
-      color: #44a51c;
+      color: #00732f;
     }
 
     .narrow .header, .narrow .header .content, .narrow .footer, .narrow .wrapper {
@@ -45,7 +45,7 @@
     {
       width: auto;
       height: auto;
-      color: #363534;
+      color: #00732f;
       position: static;
       float: left;
       margin-left: 25px;
@@ -163,7 +163,7 @@
     }
 
     .narrow .wrap .breadcrumb ul li a {
-      color: #44a51c;
+      color: #00732f;
     }
 
     .narrow .wrap .breadcrumb ul li.last a {
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 44aa918..9609714 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -26,37 +26,6 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "        </a></li>\n" \
 			  "      </ul>\n" \
 			  "     </div>\n" \
-			 " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
-			"		 <li><a href=\"#\">API Lookup</a> \n" \
-			"			 <ul id=\"topmenuLook\"> \n" \
-			"			   <li><a href=\"classes.html\">Class index</a></li> \n" \
-			" 			  <li><a href=\"functions.html\">Function index</a></li> \n" \
-			"			   <li><a href=\"modules.html\">Modules</a></li> \n" \
-			"			   <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
-			"			   <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \
-			"			   <li><a href=\"licensing.html\">Licenses and Credits</a></li> \n" \
-			"			   </ul> \n" \
-			"		 </li> \n" \
-			"		 <li><a href=\"#\">Qt Topics</a> \n" \
-			"			 <ul id=\"topmenuTopic\"> \n" \
-			"			   <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
-			"			   <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
-			"			   <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
-			"			   <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
-			"			   <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
-			"			   <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
-			"			   <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \
-			"			 </ul> \n" \
-			"		</li> \n" \
-			"		 <li><a href=\"#\">Examples</a> \n" \
-			"			 <ul id=\"topmenuexample\"> \n" \
-			"				 <li><a href=\"all-examples.html\">Examples</a></li> \n" \
-			"				 <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
-			"				 <li><a href=\"demos.html\">Demos</a></li> \n" \
-			"				 <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
-			"			 </ul> \n" \
-			"		 </li> \n" \
-			" </ul> \n" \
 			  "    </div>\n" \
 			  "  </div>\n" \
 			  "  <div class=\"wrapper\">\n" \
-- 
cgit v0.12


From 5b053a355a6186fdcfa26d3337ad9eaebce00b01 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Tue, 28 Sep 2010 13:15:27 +0200
Subject: Doc: add style to new search results

---
 doc/src/template/style/style.css | 80 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 614e296..c172e23 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -528,6 +528,8 @@
 		height:21px;
 		padding:2px 0 0 5px;
 		width:167px;
+		_height: 23px;
+		_width: 169px;		
     }
 
     .sidebar .search form input#pageType
@@ -645,6 +647,81 @@
 	.floatingResult:hover{
 	}
 	
+		
+	#resultdialog {
+	  display: none;
+	  position: absolute;
+	  *left: 30px;
+	  _left: 0;
+	  *top: 35px;
+	  _top: 30px;
+	  _zoom: 1;
+	  background-color: #fff;
+	  border: 1px solid #666;
+		z-index: 4;
+	  margin-top: 5px;
+	  _margin: 0 0 0 -20px;
+	  padding: 10px;
+	  width: 220px;
+	  _width: 196px;
+	  height: 250px;
+	  overflow: auto;
+		-webkit-border-radius: .5em;
+		-moz-border-radius: .5em;
+		border-radius: .5em;
+		-webkit-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+		-moz-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+		box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+	}
+
+	#resultdialog.active {
+	  display: block;
+	}
+
+	#resultdialog #resultclose {
+	  float: right;
+	}
+
+	#resultdialog p,
+	#resultdialog ul {
+	  clear: both;
+	  margin: 3px 0;
+	}
+
+	p#searchcount span {
+		display: none;
+	}
+
+	p#searchcount.all span#resultcount,
+	p#searchcount.api span#apicount,
+	p#searchcount.article span#articlecount,
+	p#searchcount.example span#examplecount {
+		display: inline;
+	}
+
+	#resultlist li {
+		display: none;
+	}
+
+	#resultlist.api li.api,
+	#resultlist.article li.article,
+	#resultlist.example li.example,
+	#resultlist.all li {
+		display: block;
+	}
+
+	#resultlinks.api a#showapiresults,
+	#resultlinks.api a#showapiresults:hover,
+	#resultlinks.article a#showarticleresults,
+	#resultlinks.article a#showarticleresults:hover,
+	#resultlinks.example a#showexampleresults,
+	#resultlinks.example a#showexampleresults:hover,
+	#resultlinks.all a#showallresults,
+	#resultlinks.all a#showallresults:hover {
+		color: #B0ADAB;
+	}	
+			
+	
 /* end sidebar elements */
 /* content elements */
     .wrap
@@ -1344,7 +1421,8 @@
 	.creator .wrapper .hd,
     .creator .wrapper .ft,
 	.creator .sidebar,
-	.creator .wrap .feedback
+	.creator .wrap .feedback,
+	.creator #resultdialog
     {
 	display:none;
     }
-- 
cgit v0.12


From 148e78525f76d3d716fd98af2a018cd08da541ab Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Tue, 28 Sep 2010 13:44:19 +0200
Subject: Doc: fixing slim fit style - search box.

---
 doc/src/template/style/narrow.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index 00d28b9..8e42a0d 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -203,11 +203,7 @@
       *border: 1px solid #fff;
       *height: 17px;
       _height: 18px;
-	  /* to be fixed */
-	  display: none;
-	  /* to be fixed */
     }
-
     .narrow .indexbox .indexIcon {
       display: none;
     }
@@ -268,3 +264,6 @@
     }
 
     /* end narrow mode */
+	.creator #narrowsearch, .creator #narrowmenu{
+		display:none;
+	}
-- 
cgit v0.12


From 8c65dc25962e167237c2573979b1dfff88c29326 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Wed, 29 Sep 2010 16:05:51 +0200
Subject: Doc: Implementing new doc search dialog. Removing search results from
 menus and including them in a floating dialog div element

---
 doc/src/template/scripts/functions.js |  87 ++++++++++++++++-----------
 doc/src/template/scripts/narrow.js    | 108 ++++++++++++++++++++++++----------
 doc/src/template/style/style.css      |  45 +++++++-------
 3 files changed, 152 insertions(+), 88 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 5bf8323..0bb88a8 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -1,11 +1,12 @@
 // Removing search results
 function hideSearchResults() {
+/* hiding search results as the user clicks on the different categories */
   $('#resultdialog').removeClass('active');
 	$("#resultlist").removeClass().addClass('all');
 	$("#resultlinks").removeClass().addClass('all');
 	$("#searchcount").removeClass().addClass('all');
 }
-// Closing search result box
+/* closing the searhc result dialog */
 $('#resultclose').click(function(e) {
   e.preventDefault();
   hideSearchResults();
@@ -19,14 +20,14 @@ $('.t_button').mouseover(function() {
     $('.t_button').css('cursor','pointer');
 });
 /* END non link areas  */
-// Font size small
+/* Changing font size to smaller */
 $('#smallA').click(function() {
 		$('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('font-size','smaller');
 		$('.t_button').removeClass('active')
 		$(this).addClass('active')
 });
 
-// Font size reset
+/* Reset font size */
 $('#medA').click(function() {
 		$('.mainContent .heading').css('font','600 16px/1 Arial');
 		$('.mainContent h1').css('font','600 18px/1.2 Arial');
@@ -42,8 +43,7 @@ $('#medA').click(function() {
 		$('.t_button').removeClass('active')
 		$(this).addClass('active')
 });
-
-// Font size large
+/* Changing font size to bigger */
 $('#bigA').click(function() {
 		$('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('font-size','large');
 		$('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('line-height','25px');
@@ -51,7 +51,7 @@ $('#bigA').click(function() {
 		$(this).addClass('active')
 });
 
-// Show page content after closing feedback box
+/* Show page content after closing feedback box */
 $('.feedclose').click(function() {
 	$('.bd').show();
 	$('.hd').show();
@@ -60,7 +60,7 @@ $('.feedclose').click(function() {
 	$('#blurpage').hide();
 });
 
-// Hide page content and show feedback box
+/* Hide page content and show feedback box */
 $('.feedback').click(function() {
 	$('.bd').hide();
 	$('.hd').hide();
@@ -68,9 +68,11 @@ $('.feedback').click(function() {
 	$('#feedbackBox').show();
 	$('#blurpage').show();
 });
-// Setting URL - in this case relative to root
+/* Default search URL */
 var qturl = "";
 
+/* The next function handles the response data (in xml) returned by the search engine */
+
 // Process data sent back from the server. The data is structured as a XML.
 /*
 XML structure handled by function processNokiaData()
@@ -84,47 +86,62 @@ XML structure handled by function processNokiaData()
 
 
 function processNokiaData(response){
+/* fetch the responce from the server using page as the root element */
 	var propertyTags = response.getElementsByTagName('page');
-	
-	var apiCount = 0;
+	/* reset counters */	
+	var lookupCount = 0;
 	var articleCount = 0;
 	var exampleCount = 0;
-	
 	var full_li_element;
 
+/* remove any old results */
 	$('#resultlist li').remove();
 
 
+	/* running through the elements in the xml structure */
  	for (var i=0; i<propertyTags.length; i++) {
+		/* for every element named pageWords*/
 		for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++) {
+			/* start a new list element */
 			full_li_element = '<li';
+					/* if the pageType element reads APIPage, add class name api */
       if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') {
       	full_li_element += ' class="api"';
       	apiCount++;
       }
+					/* if the pageType element reads Article, add class name article */
       else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') {
       	full_li_element += ' class="article"';
       	articleCount++;
       }
+					/* if the pageType element reads Example, add class name example */
       else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') {
       	full_li_element += ' class="example"';
       	exampleCount++;
       }
+			/* adding the link element*/
 			full_li_element += '><a href="'+qturl;
-      full_li_element += propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
-      full_li_element += '">' + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + '</a></li>';
-      $('#resultlist').append(full_li_element);
-    }
+			/* adding the URL attribute*/
+			full_li_element += propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
+      		/* adding the link title and closing the link and list elements */
+			full_li_element += '">' + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + '</a></li>';
+			/* appending the list element to the #resultlist div*/
+			$('#resultlist').append(full_li_element);
+		}
 	}
 
+	/* if the result is not empty */
 	if (propertyTags.length > 0) {
+	/* add class name active to show the dialog */
 	  $('#resultdialog').addClass('active');
+	  /* setting number of hits*/
 	  $('#resultcount').html(propertyTags.length);
 	  $('#apicount').html(apiCount);
 	  $('#articlecount').html(articleCount);
 	  $('#examplecount').html(exampleCount);
   }
 
+
   // Filtering results in display
 	$('p#resultlinks a').click(function(e) {
   	e.preventDefault();
@@ -157,8 +174,11 @@ function processNokiaData(response){
 
 //build regular expression object to find empty string or any number of blank
 var blankRE=/^\s*$/;
+
+
 function CheckEmptyAndLoadList()
 {
+	/* Start Extracting information for feedback and adding this to the feedback form */
 	var pageUrl = window.location.href;
 	var pageVal = $('title').html();
 	$('#feedUrl').remove();
@@ -166,50 +186,52 @@ function CheckEmptyAndLoadList()
 	$('.menuAlert').remove();
 	$('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">');
 	$('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">');
-	$('.liveResult').remove();
-    $('.defaultLink').css('display','block');
+	/* End Extracting information for feedback and adding this to the feedback form */
+
+	/* extracts search query */
 	var value = document.getElementById('pageType').value; 
+	/* if the search is less than three chars long remove class names and remove elements from old search*/
 	if((blankRE.test(value)) || (value.length < 3))
 	{
-
-
-
-	 $('.defaultLink').css('display','block');
-
 	$('#resultdialog').removeClass('active');
 	$('#resultlist li').remove();
-	}else{
-
 	}
 }
 
 // Loads on doc ready - prepares search 
 	$(document).ready(function () {
-
-
+	/* fetch page title*/ 
 	var pageTitle = $('title').html();
+	/* getting content from search box */
           var currentString = $('#pageType').val() ;
+	  /* if the search box is not empty run CheckEmptyAndLoadList*/
 		  if(currentString.length < 1){
-			$('.defaultLink').css('display','block');
       	   		CheckEmptyAndLoadList();			
 		  }
 
+		/* on key-up in the search box execute the following */
         $('#pageType').keyup(function () {
+		/* extract the search box content */
           var searchString = $('#pageType').val() ;
+	  /* if the string is less than three characters */
           if ((searchString == null) || (searchString.length < 3)) {
+			/* remove classes and elements*/
 				$('#pageType').removeClass('loading');
-				 $('.liveResult').remove(); 
 				 $('.searching').remove(); 
+			/*  run CheckEmptyAndLoadList */
       	   		CheckEmptyAndLoadList();
-				$('.report').remove();
 
+				$('.report').remove();
 				return;
 		   }
+	   /* if timer checks out */
             if (this.timer) clearTimeout(this.timer);
             this.timer = setTimeout(function () {
+			/* add loading image by adding loading class */
 				$('#pageType').addClass('loading');
 				$('.searching').remove(); 
 
+			/* run the actual search */
                $.ajax({
                 contentType: "application/x-www-form-urlencoded",
                 url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
@@ -217,8 +239,7 @@ function CheckEmptyAndLoadList()
                 dataType:'xml',
 				type: 'post',	 
                 success: function (response, textStatus) {
-
-				$('.liveResult').remove(); 
+				/* on success remove loading img */
 				$('.searching').remove(); 
 				$('#pageType').removeClass('loading');
 
@@ -226,6 +247,6 @@ function CheckEmptyAndLoadList()
 
  }     
               });
-            }, 500);
+            }, 500); /* timer set to 500 ms */
         });
-      }); 
+      }); 
\ No newline at end of file
diff --git a/doc/src/template/scripts/narrow.js b/doc/src/template/scripts/narrow.js
index 35c81bf..a5e8b97 100644
--- a/doc/src/template/scripts/narrow.js
+++ b/doc/src/template/scripts/narrow.js
@@ -1,17 +1,15 @@
+/* This function generates menus and search box in narrow/slim fit mode */
 var narrowInit = function() {
-  /* TODO:
-  Could probably be more efficient, not hardcoding each element to be created
-  */
-  // 1: Create search form
+  /* 1: Create search form */ 
   var narrowSearch = $('<div id="narrowsearch"></div>');
   var searchform = $("#qtdocsearch");
   narrowSearch.append(searchform);
   $("#qtdocheader .content .qtref").after(narrowSearch);
 
-  // 2: Create dropdowns
+  /* 2: Create dropdowns */ 
   var narrowmenu = $('<ul id="narrowmenu" class="sf-menu"></ul>');
 
-  // Lookup
+  /* Lookup */ 
   var lookuptext = $("#lookup h2").attr("title");
   $("#lookup ul").removeAttr("id");
   $("#lookup ul li").removeAttr("class");
@@ -24,7 +22,7 @@ var narrowInit = function() {
   lookuplist.append(lookupul);
   narrowmenu.append(lookuplist);
 
-  // Topics
+  /* Topics */ 
   var topicstext = $("#topics h2").attr("title");
   $("#topics ul").removeAttr("id");
   $("#topics ul li").removeAttr("class");
@@ -37,7 +35,7 @@ var narrowInit = function() {
   topicslist.append(topicsul);
   narrowmenu.append(topicslist);
 
-  // Examples
+  /* Examples */ 
   var examplestext = $("#examples h2").attr("title");
   $("#examples ul").removeAttr("id");
   $("#examples ul li").removeAttr("class");
@@ -58,32 +56,78 @@ var narrowInit = function() {
   });
 }
 
+/* Executes on doc ready */
 $(document).ready(function(){
-/*   if ($('body').hasClass('narrow')) {
-    narrowInit();
-  }
- */
- if($(window).width()<600) {
-    $('body').addClass('narrow');
-
-    if ($("#narrowsearch").length == 0) {
-      narrowInit();
-    }
-  }
-  else {
-    $('body').removeClass('narrow');
+	/* check if body has the narrow class */
+	if ($('body').hasClass('narrow')) {
+		/* run narrowInit */
+		narrowInit();
+	}
+ 
+	/* messure window width and add class if it is smaller than 600 px */
+	if($(window).width()<600) {
+		$('body').addClass('narrow');
+		/* if the search box contains */
+		if ($("#narrowsearch").length == 0) {
+			/* run narrowInit */
+			narrowInit();
+		}
+	  }
+	  else { /* if the window is wider than 600 px, narrow is removed */
+		$('body').removeClass('narrow');
+		if ($("#narrowsearch").length == 0) {
+		}
+	}
+});
+/* binding resize event to this funciton */
+$(window).bind('resize', function () {
+	/*  if the window is wider than 600 px, narrow class is added */
+	if($(window).width()<600) {
+		$('body').addClass('narrow');
+		if ($("#narrowsearch").length == 0) {
+		  narrowInit();
+		}
+	}
+	else {
+		/* else we remove the narrow class */
+		$('body').removeClass('narrow');
   }
 });
 
-$(window).bind('resize', function () {
-  if($(window).width()<600) {
-    $('body').addClass('narrow');
+	$('#narrowsearch').keyup(function () {
+		/* extract the search box content */
+	  var searchString = $('#narrowsearch').val();
+	  /* if the string is less than three characters */
+	  if ((searchString == null) || (searchString.length < 3)) {
+			/* remove classes and elements*/
+			$('#narrowsearch').removeClass('loading');
+			$('.searching').remove(); 
+			/*  run CheckEmptyAndLoadList */
+			CheckEmptyAndLoadList();
+			
+			$('.report').remove();
+			return;
+	   }
+	   /* if timer checks out */
+		if (this.timer) clearTimeout(this.timer);
+		this.timer = setTimeout(function () {
+			/* add loading image by adding loading class */
+			$('#narrowsearch').addClass('loading');
+			$('.searching').remove(); 
 
-    if ($("#narrowsearch").length == 0) {
-      narrowInit();
-    }
-  }
-  else {
-    $('body').removeClass('narrow');
-  }
-});
\ No newline at end of file
+			/* run the actual search */
+		   $.ajax({
+			contentType: "application/x-www-form-urlencoded",
+			url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
+			data: 'searchString='+searchString,
+			dataType:'xml',
+			type: 'post',	 
+			success: function (response, textStatus) {
+				/* on success remove loading img */
+				$('.searching').remove(); 
+				$('#narrowsearch').removeClass('loading');
+				processNokiaData(response);
+			}     
+		  });
+		}, 500); /* timer set to 500 ms */
+	});
\ No newline at end of file
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index c172e23..5833266 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -528,8 +528,6 @@
 		height:21px;
 		padding:2px 0 0 5px;
 		width:167px;
-		_height: 23px;
-		_width: 169px;		
     }
 
     .sidebar .search form input#pageType
@@ -629,25 +627,11 @@
 			background:url("../images/spinner.gif") no-repeat scroll right center transparent;
 	}
 
-.floatingResult{
-	z-index:1;
-	position:relative;
-	padding-top:0px;
-	background-color:white;
-	border:solid 1px black;
-	height:250px;
-	width:600px;
-	overflow-x:hidden;
-	overflow-y:auto;
-}
-
-	.floatingResult:hover{
-		display:block;
-	}
-	.floatingResult:hover{
+	.sidebar .search form {
+		_height: 23px;
+		_width: 169px;
 	}
-	
-		
+
 	#resultdialog {
 	  display: none;
 	  position: absolute;
@@ -720,7 +704,23 @@
 	#resultlinks.all a#showallresults:hover {
 		color: #B0ADAB;
 	}	
-			
+	.floatingResult{
+		z-index:1;
+		position:relative;
+		padding-top:0px;
+		background-color:white;
+		border:solid 1px black;
+		height:250px;
+		width:600px;
+		overflow-x:hidden;
+		overflow-y:auto;
+	}
+
+	.floatingResult:hover{
+		display:block;
+	}
+	.floatingResult:hover{
+	}
 	
 /* end sidebar elements */
 /* content elements */
@@ -1421,8 +1421,7 @@
 	.creator .wrapper .hd,
     .creator .wrapper .ft,
 	.creator .sidebar,
-	.creator .wrap .feedback,
-	.creator #resultdialog
+	.creator .wrap .feedback
     {
 	display:none;
     }
-- 
cgit v0.12


From 976391c5ce2bbe3b992298e140bbbbc596ca756f Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Fri, 1 Oct 2010 17:18:39 +1000
Subject: Update change log.

---
 dist/changes-4.7.1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 2d79ac1..68b23ba 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -109,7 +109,11 @@ QtDBus
 
 QtMultimedia
 ------------
-
+ - QAudioOutput
+    * [QTBUG-11586] Support audio with more than two channels.
+    * [QTBUG-11755] Fixed outputing audio in push mode with ALSA.
+    * [QTBUG-11883] Fixed segmentation fault when closing a QAudioInput or
+      QAudioOutput.
 
 QtNetwork
 ---------
-- 
cgit v0.12


From e4407012815a805d9a7d1a3beb7038a93cdd74dd Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 1 Oct 2010 10:35:46 +0200
Subject: Make the OpenSSL library search also hit /lib.

Task-number: http://bugs.meego.com/show_bug.cgi?id=7777
Reviewed-by: Markus Goetz
---
 src/network/ssl/qsslsocket_openssl_symbols.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 6affa36..d717214 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -333,7 +333,7 @@ static QStringList findAllLibSsl()
     paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH"))
             .split(QLatin1Char(':'), QString::SkipEmptyParts);
 #  endif
-    paths << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
+    paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
 
     QStringList foundSsls;
     foreach (const QString &path, paths) {
-- 
cgit v0.12


From 4ee6f86baccd7c5ba065fd00d22120e71e1f6d3a Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
Date: Fri, 1 Oct 2010 12:08:24 +0200
Subject: Incorrect selection background for unfocused widgets with GTK

In Ubuntu 10.10 the unfocused selection background is different
from the focused one. Interestingly they use GTK_STATE_ACTIVE
for unfocused widgets. This was verified back to GTK 2.10 which is
the required minimum for QGtkStyle so it should be safe for
all other styles as well.

Task-number: QTBUG-13792
Reviewed-by: thorbjorn
---
 src/gui/styles/qgtkstyle.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index c5429dd..7f342f9 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -225,9 +225,8 @@ QPalette QGtkStyle::standardPalette() const
         GtkStyle *style = d->gtkStyle();
         GtkWidget *gtkButton = d->gtkWidget("GtkButton");
         GtkWidget *gtkEntry = d->getTextColorWidget();
-
-        GdkColor gdkBg, gdkBase, gdkText, gdkForeground, gdkSbg, gdkSfg;
-        QColor bg, base, text, fg, highlight, highlightText;
+        GdkColor gdkBg, gdkBase, gdkText, gdkForeground, gdkSbg, gdkSfg, gdkaSbg, gdkaSfg;
+        QColor bg, base, text, fg, highlight, highlightText, inactiveHighlight, inactiveHighlightedTExt;
         gdkBg = style->bg[GTK_STATE_NORMAL];
         gdkForeground = gtkButton->style->fg[GTK_STATE_NORMAL];
 
@@ -237,14 +236,23 @@ QPalette QGtkStyle::standardPalette() const
         gdkText = gtkEntry->style->text[GTK_STATE_NORMAL];
         gdkSbg = gtkEntry->style->base[GTK_STATE_SELECTED];
         gdkSfg = gtkEntry->style->text[GTK_STATE_SELECTED];
+
+        // The ACTIVE base color is really used for inactive windows
+        gdkaSbg = gtkEntry->style->base[GTK_STATE_ACTIVE];
+        gdkaSfg = gtkEntry->style->text[GTK_STATE_ACTIVE];
+
         bg = QColor(gdkBg.red>>8, gdkBg.green>>8, gdkBg.blue>>8);
         text = QColor(gdkText.red>>8, gdkText.green>>8, gdkText.blue>>8);
         fg = QColor(gdkForeground.red>>8, gdkForeground.green>>8, gdkForeground.blue>>8);
         base = QColor(gdkBase.red>>8, gdkBase.green>>8, gdkBase.blue>>8);
         highlight = QColor(gdkSbg.red>>8, gdkSbg.green>>8, gdkSbg.blue>>8);
         highlightText = QColor(gdkSfg.red>>8, gdkSfg.green>>8, gdkSfg.blue>>8);
+        inactiveHighlight = QColor(gdkaSbg.red>>8, gdkaSbg.green>>8, gdkaSbg.blue>>8);
+        inactiveHighlightedTExt = QColor(gdkaSfg.red>>8, gdkaSfg.green>>8, gdkaSfg.blue>>8);
 
         palette.setColor(QPalette::HighlightedText, highlightText);
+
+
         palette.setColor(QPalette::Light, bg.lighter(125));
         palette.setColor(QPalette::Shadow, bg.darker(130));
         palette.setColor(QPalette::Dark, bg.darker(120));
@@ -279,6 +287,10 @@ QPalette QGtkStyle::standardPalette() const
         highlightText.setHsv(highlightText.hue(), 0, highlightText.value(), highlightText.alpha());
         palette.setColor(QPalette::Disabled, QPalette::Highlight, highlight);
         palette.setColor(QPalette::Disabled, QPalette::HighlightedText, highlightText);
+
+        palette.setColor(QPalette::Inactive, QPalette::HighlightedText, inactiveHighlightedTExt);
+        palette.setColor(QPalette::Inactive, QPalette::Highlight, inactiveHighlight);
+
         style = d->gtk_rc_get_style_by_paths(d->gtk_settings_get_default(), "gtk-tooltips", "GtkWindow",
                 d->gtk_window_get_type());
         if (style) {
-- 
cgit v0.12


From 19085117bfece0709c996ed445a476add4f6815b Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
Date: Fri, 1 Oct 2010 12:40:44 +0200
Subject: Fix focus appearance of tabwidget tabs with QGtkStyle

There was an issue with ubuntu Ambience theme since it requires
a custom tab style. This was not currently supported by
QGtkStyle.

Task-number: QTBUG-14161
Reviewed-by: thorbjorn
---
 src/gui/styles/qgtkstyle.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 7f342f9..9cc64b3 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -803,10 +803,13 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element,
             // ### this mess should move to subcontrolrect
             QRect frameRect = option->rect.adjusted(1, 1, -1, -2);
 
-            if (qobject_cast<const QTabBar*>(widget))
-                frameRect.adjust(-1, 1, 1, 1);
-
-            gtkPainter.paintFocus(NULL, "tab", frameRect, GTK_STATE_ACTIVE, style);
+            if (qobject_cast<const QTabBar*>(widget)) {
+                GtkWidget *gtkNotebook = d->gtkWidget("GtkNotebook");
+                style = gtkPainter.getStyle(gtkNotebook);
+                gtkPainter.paintFocus(gtkNotebook, "tab", frameRect.adjusted(-1, 1, 1, 1), GTK_STATE_ACTIVE, style);
+            } else {
+                gtkPainter.paintFocus(NULL, "tab", frameRect, GTK_STATE_ACTIVE, style);
+            }
         }
         break;
 
-- 
cgit v0.12


From 8a895dbcc9aacab3b0059119650a74bbaff1a27b Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 30 Sep 2010 10:04:50 +0200
Subject: Setting the _NET_WM_STATE Atom only when its not already set

Task: QT-3918
Reviewed By: Bradley T. Hughes
---
 src/gui/kernel/qwidget_x11.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 8d80e10..9085e98 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -1933,20 +1933,27 @@ void QWidgetPrivate::show_sys()
         if (flags & Qt::WindowStaysOnTopHint) {
             if (flags & Qt::WindowStaysOnBottomHint)
                 qWarning() << "QWidget: Incompatible window flags: the window can't be on top and on bottom at the same time";
-            netWmState.append(ATOM(_NET_WM_STATE_ABOVE));
-            netWmState.append(ATOM(_NET_WM_STATE_STAYS_ON_TOP));
+            if (!netWmState.contains(ATOM(_NET_WM_STATE_ABOVE)))
+                netWmState.append(ATOM(_NET_WM_STATE_ABOVE));
+            if (!netWmState.contains(ATOM(_NET_WM_STATE_STAYS_ON_TOP)))
+                netWmState.append(ATOM(_NET_WM_STATE_STAYS_ON_TOP));
         } else if (flags & Qt::WindowStaysOnBottomHint) {
-            netWmState.append(ATOM(_NET_WM_STATE_BELOW));
+            if (!netWmState.contains(ATOM(_NET_WM_STATE_BELOW)))
+                netWmState.append(ATOM(_NET_WM_STATE_BELOW));
         }
         if (q->isFullScreen()) {
-            netWmState.append(ATOM(_NET_WM_STATE_FULLSCREEN));
+            if (!netWmState.contains(ATOM(_NET_WM_STATE_FULLSCREEN)))
+                netWmState.append(ATOM(_NET_WM_STATE_FULLSCREEN));
         }
         if (q->isMaximized()) {
-            netWmState.append(ATOM(_NET_WM_STATE_MAXIMIZED_HORZ));
-            netWmState.append(ATOM(_NET_WM_STATE_MAXIMIZED_VERT));
+            if (!netWmState.contains(ATOM(_NET_WM_STATE_MAXIMIZED_HORZ)))
+                netWmState.append(ATOM(_NET_WM_STATE_MAXIMIZED_HORZ));
+            if (!netWmState.contains(ATOM(_NET_WM_STATE_MAXIMIZED_VERT)))
+                netWmState.append(ATOM(_NET_WM_STATE_MAXIMIZED_VERT));
         }
         if (data.window_modality != Qt::NonModal) {
-            netWmState.append(ATOM(_NET_WM_STATE_MODAL));
+            if (!netWmState.contains(ATOM(_NET_WM_STATE_MODAL)))
+                netWmState.append(ATOM(_NET_WM_STATE_MODAL));
         }
 
         if (!netWmState.isEmpty()) {
-- 
cgit v0.12


From dc4d4a87c0c17e41c0e16bc481db82de0f620596 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Fri, 1 Oct 2010 14:26:49 +0200
Subject: Doc: Implementing features to the search feature. Adding search to
 narrow/slim fit mode

---
 doc/src/template/scripts/functions.js | 2 +-
 doc/src/template/style/narrow.css     | 1 +
 doc/src/template/style/style.css      | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 0bb88a8..b89e05f 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -89,7 +89,7 @@ function processNokiaData(response){
 /* fetch the responce from the server using page as the root element */
 	var propertyTags = response.getElementsByTagName('page');
 	/* reset counters */	
-	var lookupCount = 0;
+	var apiCount = 0;
 	var articleCount = 0;
 	var exampleCount = 0;
 	var full_li_element;
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index 8e42a0d..c1e3f61 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -61,6 +61,7 @@
     {
       background-image: none;
       text-indent: 0;
+        width: 260px;
     }
 
     .narrow .header #nav-topright
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 5833266..c07385c 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -204,6 +204,10 @@
     {
         font-size: 13px;
     }
+	.red
+	{
+		color:red;
+	}
 /* end font style elements */
 
 /* global settings*/
@@ -907,7 +911,6 @@
     .wrap .content table p
     {
         line-height: 20px;
-       /* padding: 0px;*/
     }	
     .wrap .content ul
     {
-- 
cgit v0.12


From 628c9625c4bf6d0e189f9e8da5268eb7629e7597 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Fri, 1 Oct 2010 14:56:00 +0200
Subject: Doc: Fixing link titles and error color in search results

---
 doc/src/template/scripts/functions.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index b89e05f..47539d2 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -124,7 +124,7 @@ function processNokiaData(response){
 			/* adding the URL attribute*/
 			full_li_element += propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
       		/* adding the link title and closing the link and list elements */
-			full_li_element += '">' + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + '</a></li>';
+			full_li_element += '">' + propertyTags[i].getElementsByTagName('pageWords')[0].firstChild.nodeValue + '</a></li>';
 			/* appending the list element to the #resultlist div*/
 			$('#resultlist').append(full_li_element);
 		}
@@ -139,7 +139,12 @@ function processNokiaData(response){
 	  $('#apicount').html(apiCount);
 	  $('#articlecount').html(articleCount);
 	  $('#examplecount').html(exampleCount);
-  }
+	  
+	}
+	else {
+	  $('#pageType').addClass('red');
+	  }
+  
 
 
   // Filtering results in display
@@ -181,6 +186,7 @@ function CheckEmptyAndLoadList()
 	/* Start Extracting information for feedback and adding this to the feedback form */
 	var pageUrl = window.location.href;
 	var pageVal = $('title').html();
+	$('#pageType').removeClass('red');
 	$('#feedUrl').remove();
 	$('#pageVal').remove();
 	$('.menuAlert').remove();
-- 
cgit v0.12


From b3a46493a1a74bd7918bd68638c28cf6e84eb57f Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Thu, 15 Jul 2010 16:08:43 +0200
Subject: QWorkspace: fix hardcoded min size overwriting the real min size

The setMinimumSize call was having precedence over the minimumSizeHint,
so when having a sizegrip enabled it was possible to resize a MDI window to
a much smaller size than its min size (actually it would flicker between
the two sizes, on each resize). Fixed by moving that min size (for the
titlebar contents) to the calculations in minimumSizeHint().

Reviewed-by: mariusso
---
 src/gui/widgets/qworkspace.cpp           | 15 +++++++++------
 tests/auto/qworkspace/tst_qworkspace.cpp | 10 ++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp
index 7180c4d..3a9b30c 100644
--- a/src/gui/widgets/qworkspace.cpp
+++ b/src/gui/widgets/qworkspace.cpp
@@ -2551,7 +2551,6 @@ QWorkspaceChild::QWorkspaceChild(QWidget* window, QWorkspace *parent, Qt::Window
                  this, SLOT(titleBarDoubleClicked()));
     }
 
-    setMinimumSize(128, 0);
     int fw =  style()->pixelMetric(QStyle::PM_MdiSubWindowFrameWidth, 0, this);
     setContentsMargins(fw, fw, fw, fw);
 
@@ -2702,11 +2701,15 @@ QSize QWorkspaceChild::sizeHint() const
 
 QSize QWorkspaceChild::minimumSizeHint() const
 {
-    if (!childWidget)
-        return QWidget::minimumSizeHint() + baseSize();
-    QSize s = childWidget->minimumSize();
-    if (s.isEmpty())
-        s = childWidget->minimumSizeHint();
+    QSize s;
+    if (!childWidget) {
+        s = QWidget::minimumSizeHint();
+    } else {
+        s = childWidget->minimumSize();
+        if (s.isEmpty())
+            s = childWidget->minimumSizeHint();
+    }
+    s = s.expandedTo(QSize(128, 0));
     return s + baseSize();
 }
 
diff --git a/tests/auto/qworkspace/tst_qworkspace.cpp b/tests/auto/qworkspace/tst_qworkspace.cpp
index 4cf76b5..9039eb3 100644
--- a/tests/auto/qworkspace/tst_qworkspace.cpp
+++ b/tests/auto/qworkspace/tst_qworkspace.cpp
@@ -44,6 +44,7 @@
 #include <qapplication.h>
 #include <qmainwindow.h>
 #include <qmenubar.h>
+#include <qlayout.h>
 #include <qworkspace.h>
 #if defined(QT3_SUPPORT)
 #include <q3popupmenu.h>
@@ -591,16 +592,25 @@ void tst_QWorkspace::childSize()
 
     MyChild *child = new MyChild(&ws);
     child->show();
+    ws.addWindow(child);
     QCOMPARE(child->size(), child->sizeHint());
     delete child;
 
     child = new MyChild(&ws);
     child->setFixedSize(200, 200);
     child->show();
+    ws.addWindow(child);
     QCOMPARE(child->size(), child->minimumSize());
+    QCOMPARE(child->parentWidget()->metaObject()->className(), "QWorkspaceChild");
+    QVERIFY(child->parentWidget()->width() >= 200);
+    // check that the minimum size is respected, using closestAcceptableSize
+    // like QSizeGrip does.
+    const QSize newSize = QLayout::closestAcceptableSize(child->parentWidget(), QSize(100, 100));
+    QVERIFY(newSize.width() >= 200);
     delete child;
 
     child = new MyChild(&ws);
+    ws.addWindow(child);
     child->resize(150, 150);
     child->show();
     QCOMPARE(child->size(), QSize(150,150));
-- 
cgit v0.12


From 0b905d602ffb24b8cad4f09d84a5f762cc6a6603 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 4 Oct 2010 14:27:10 +0300
Subject: My changes for 4.7.1

Reviewed-by: TrustMe
---
 dist/changes-4.7.1 | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 68b23ba..51a10a3 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -308,7 +308,7 @@ Qt for Symbian
    * [QTBUG-4586] Fixed wrong paths in include/ActiveQt/headers.pri.
    * [QTBUG-11671] Fixed audio-backend detection in configure tests.
 
- - qmake
+ - qmake & mkspecs
    * [QTBUG-13523] Added support for using -L notation in the LIBS variable
      when building with the symbian/linux-armcc or gcce mkspec.
    * [QTBUG-12851] Fix assertion on Windows when DESTDIR is empty in static
@@ -318,6 +318,31 @@ Qt for Symbian
      .pro file.
    * [QTBUG-13081] vc[x]proj generators: support /MAP option without file
      name.
+   * [QTBUG-13902] Added support for unsigned smart installer package creation.
+   * [QTBUG-13991] No longer need to manually edit smart installer pkg file for publishing.
+   * [QT-3949] Load environment.prf from Symbian SDK if it exists there.
+   * [QTBUG-13499] Provide a way to compile with RVCT 4.0 using generated Makefile.
+   * [QTBUG-13336] Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.
+   * [QTBUG-13363] Fix Symbian handling of projects with special characters in TARGET.
+   * [QTBUG-12762 & QTBUG-13307] Gcce building support for symbian-sbsv2
+   * [QTBUG-13147] Added support for DEPLOYMENT.pkg_build_version
+   * [QTBUG-12884] Fix "installer_sis" and "deploy" targets when TARGET has path.
+   * [QTBUG-12879] Fix check to remove unnecessary deployments in Symbian.
+   * [QTBUG-12716] Make bld.inf target in Symbian mkspecs to depend on .pro file.
+   * [QTBUG-12715] Rename Symbian generated mmp/mk files to include target in filename.
+   * [QTBUG-12617] Fix package header in cases where VERSION doesn't contain all values.
+   * Fix run and runonphone targets for projects that have TARGET with path.
+   * Fix QT_LIBINFIX for QT_PLUGINS_BASE_DIR.
+   * No longer require PRE_TARGETDEPS items to be absolute for symbian-sbsv2 mkspec.
+   * Do smart command replacement for commands containing $$QMAKE_*
+     command variables, such as $$QMAKE_COPY, when generating bld.inf
+     extensions for QMAKE_EXTRA_* variables for symbian-sbsv2 mkspec.
+
+ - s60installs
+   * Fixed qsymbianbearer.qtplugin exports in s60installs.pro.
+
+ - patch_capabilities.pl
+   * [QTBUG-13760] Improved output of patch_capabilities.pl script.
 
  - QInputContext
    * [QTBUG-12949] Fixed a bug where passwords would not be committed when
@@ -325,6 +350,23 @@ Qt for Symbian
    * [QTBUG-13472] Fixed crash in input methods when using symbols menu and
      numbers only.
 
+ - QDesktopWidget
+   * [QTBUG-14058] Fix QApplication::desktop()->availableGeometry().
+
+ - QtCore
+   * [QTBUG-13802] Symbian^4 platform detection for QSysInfo::symbianVersion().
+   * [QTBUG-13612] Do not wait for QThread exit when destroying global statics.
+   * [QT-3895] Change RLibrary handle in QS60PluginResolver to be process wide.
+   * [QTBUG-11218] Fix QProcessManager destruction.
+
+ - Qt Plugins
+   * [QT-3949] Remove pre-Symbian3 plugins from Symbian3 and later builds and
+     Check S60_VERSION instead of existence of certain files in bearer plugin.
+
+ - Demos & Examples
+   * [QTBUG-13461] Remove some .pro statements left behind after IAP usage cleanup
+   * [QTBUG-12276] Assigned valid UID3 for fortuneserver example.
+
 Qt for Windows CE
 -----------------
  - Gui
-- 
cgit v0.12


From d203e7d078cc2bb43ccb32282f40cedbffee4095 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Mon, 4 Oct 2010 14:12:10 +0200
Subject: Small improvement in the textedit demo

We don't need to retrieve the content of the clipboard just to check if
it is empty or not - that is quite a heavy operation if the clipboard
contains large piece of data.

Related to QTBUG-11085
Reviewed-by: Bradley T. Hughes
---
 demos/textedit/textedit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
index e1f24a1..165c97c 100644
--- a/demos/textedit/textedit.cpp
+++ b/demos/textedit/textedit.cpp
@@ -262,7 +262,7 @@ void TextEdit::setupEditActions()
     tb->addAction(a);
     menu->addAction(a);
 #ifndef QT_NO_CLIPBOARD
-    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+    actionPaste->setEnabled(QApplication::clipboard()->mimeData()->hasText());
 #endif
 }
 
@@ -681,7 +681,7 @@ void TextEdit::cursorPositionChanged()
 void TextEdit::clipboardDataChanged()
 {
 #ifndef QT_NO_CLIPBOARD
-    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+    actionPaste->setEnabled(QApplication::clipboard()->mimeData()->hasText());
 #endif
 }
 
-- 
cgit v0.12


From a636fa9006b7f4cb898cdeec38a99c994fd9259e Mon Sep 17 00:00:00 2001
From: Andy Shaw <qt-info@nokia.com>
Date: Mon, 4 Oct 2010 15:10:25 +0200
Subject: Ensure that the underline is only drawn when expected for an accel

On Mac, the underline for an accel should not be drawn at all as this is
not part of the style guidelines.  This ensures that it is not drawn.

Autotest included which required a change to drawItemText() to go via
the proxy as well so that the autotest would be useful too.

Task-number: QTBUG-14172
Reviewed-by: Richard
---
 src/gui/styles/qmacstyle_mac.mm  | 10 ++++----
 tests/auto/qstyle/tst_qstyle.cpp | 51 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 671a888..fb31ae4 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -3336,6 +3336,8 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
                     if (needText) {
                         QPalette pal = tb->palette;
                         QPalette::ColorRole role = QPalette::NoRole;
+                        if (!proxy()->styleHint(SH_UnderlineShortcut, tb, w))
+                            alignment |= Qt::TextHideMnemonic;
                         if (down)
                             cr.translate(shiftX, shiftY);
                         if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5
@@ -3353,13 +3355,13 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
                                 role = QPalette::HighlightedText;
                             }
                         }
-                        drawItemText(p, cr, alignment, pal,
-                                     tb->state & State_Enabled, tb->text, role);
+                        proxy()->drawItemText(p, cr, alignment, pal,
+                                              tb->state & State_Enabled, tb->text, role);
                         if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5 &&
                             (tb->state & State_Sunken)) {
                             // Draw a "drop shadow" in earlier versions.
-                            drawItemText(p, cr.adjusted(0, 1, 0, 1), alignment,
-                                         tb->palette, tb->state & State_Enabled, tb->text);
+                            proxy()->drawItemText(p, cr.adjusted(0, 1, 0, 1), alignment,
+                                                  tb->palette, tb->state & State_Enabled, tb->text);
                         }
                     }
                 } else {
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp
index a76c82d..ba24225 100644
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/qstyle/tst_qstyle.cpp
@@ -53,6 +53,7 @@
 #include <qscrollbar.h>
 #include <qprogressbar.h>
 #include <qtoolbutton.h>
+#include <qtoolbar.h>
 
 #include <qplastiquestyle.h>
 #include <qwindowsstyle.h>
@@ -146,6 +147,7 @@ private slots:
     void pixelMetric();
     void progressBarChangeStyle();
     void defaultFont();
+    void testDrawingShortcuts();
 private:
     void lineUpLayoutTest(QStyle *);
     QWidget *testWidget;
@@ -781,5 +783,54 @@ void tst_QStyle::defaultFont()
     qApp->setFont(defaultFont);
 }
 
+class DrawTextStyle : public QProxyStyle
+{
+    Q_OBJECT
+public:
+    DrawTextStyle(QStyle *base = 0) : QProxyStyle(), alignment(0) { setBaseStyle(base); }
+    void drawItemText(QPainter *painter, const QRect &rect,
+                              int flags, const QPalette &pal, bool enabled,
+                              const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const
+    {
+        DrawTextStyle *that = (DrawTextStyle *)this;
+        that->alignment = flags;
+        QProxyStyle::drawItemText(painter, rect, flags, pal, enabled, text, textRole);
+    }
+    int alignment;
+};
+
+void tst_QStyle::testDrawingShortcuts()
+{
+    {   
+        QWidget w;
+        QToolButton *tb = new QToolButton(&w);
+        tb->setText("&abc");
+        DrawTextStyle *dts = new DrawTextStyle;
+        w.show();
+        tb->setStyle(dts);
+        QPixmap::grabWidget(tb);
+        QStyleOptionToolButton sotb;
+        sotb.initFrom(tb);
+        bool showMnemonic = dts->styleHint(QStyle::SH_UnderlineShortcut, &sotb, tb);
+        QVERIFY(dts->alignment & (showMnemonic ? Qt::TextShowMnemonic : Qt::TextHideMnemonic));
+        delete dts;
+    }
+    {
+        QToolBar w;
+        QToolButton *tb = new QToolButton(&w);
+        tb->setText("&abc");
+        DrawTextStyle *dts = new DrawTextStyle;
+        w.addWidget(tb);
+        w.show();
+        tb->setStyle(dts);
+        QPixmap::grabWidget(tb);
+        QStyleOptionToolButton sotb;
+        sotb.initFrom(tb);
+        bool showMnemonic = dts->styleHint(QStyle::SH_UnderlineShortcut, &sotb, tb);
+        QVERIFY(dts->alignment & (showMnemonic ? Qt::TextShowMnemonic : Qt::TextHideMnemonic));
+        delete dts;
+     }   
+}
+
 QTEST_MAIN(tst_QStyle)
 #include "tst_qstyle.moc"
-- 
cgit v0.12


From 0ee5619ac77285935317a2a068c90f8c999b3f0d Mon Sep 17 00:00:00 2001
From: axasia <axasia@gmail.com>
Date: Mon, 4 Oct 2010 19:01:41 +0200
Subject: Update japanese translations.

Merge-request: 837
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 translations/assistant_ja.ts | 587 ++++++++++++++++++++++++++-
 translations/designer_ja.ts  |  58 ++-
 translations/linguist_ja.ts  | 924 ++++++++++++++++++++++++++++++++++++++++++-
 translations/qt_ja.ts        | 740 ++++++++++++++++++----------------
 translations/qtconfig_ja.ts  | 194 ---------
 translations/qvfb_ja.ts      | 110 ------
 6 files changed, 1952 insertions(+), 661 deletions(-)
 mode change 100644 => 100755 translations/assistant_ja.ts
 mode change 100644 => 100755 translations/linguist_ja.ts
 mode change 100644 => 100755 translations/qt_ja.ts

diff --git a/translations/assistant_ja.ts b/translations/assistant_ja.ts
old mode 100644
new mode 100755
index afebc9a..c449e00
--- a/translations/assistant_ja.ts
+++ b/translations/assistant_ja.ts
@@ -69,15 +69,15 @@ Reason:
     </message>
     <message>
         <source>Error reading collection file &apos;%1&apos;: %2.</source>
-        <translation>コレクションファイル &apos;%1&apos; の読み込み中にエラーが発生しました: %2</translation>
+        <translation>コレクションファイル &apos;%1&apos; の読み込み中にエラーが発生しました: %2。</translation>
     </message>
     <message>
         <source>Error creating collection file &apos;%1&apos;: %2.</source>
-        <translation>コレクションファイル &apos;%1&apos; の作成中にエラーが発生しました: %2</translation>
+        <translation>コレクションファイル &apos;%1&apos; の作成中にエラーが発生しました: %2。</translation>
     </message>
     <message>
         <source>Error reading collection file &apos;%1&apos;: %2</source>
-        <translation>コレクションファイル &apos;%1&apos; の読み込み中にエラーが発生しました: %2</translation>
+        <translation type="obsolete">コレクションファイル &apos;%1&apos; の読み込み中にエラーが発生しました: %2</translation>
     </message>
     <message>
         <source>Cannot load sqlite database driver!</source>
@@ -120,6 +120,17 @@ Reason:
     </message>
 </context>
 <context>
+    <name>BookmarkItem</name>
+    <message>
+        <source>New Folder</source>
+        <translation>新しいフォルダ</translation>
+    </message>
+    <message>
+        <source>Untitled</source>
+        <translation>タイトルなし</translation>
+    </message>
+</context>
+<context>
     <name>BookmarkManager</name>
     <message>
         <source>Bookmarks</source>
@@ -357,6 +368,60 @@ Reason:
 <context>
     <name>CmdLineParser</name>
     <message>
+        <source>Usage: assistant [Options]
+
+-collectionFile file       Uses the specified collection
+                           file instead of the default one
+-showUrl url               Shows the document with the
+                           url.
+-enableRemoteControl       Enables Assistant to be
+                           remotely controlled.
+-show widget               Shows the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-activate widget           Activates the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-hide widget               Hides the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-register helpFile         Registers the specified help file
+                           (.qch) in the given collection
+                           file.
+-unregister helpFile       Unregisters the specified help file
+                           (.qch) from the give collection
+                           file.
+-setCurrentFilter filter   Set the filter as the active filter.
+-remove-search-index       Removes the full text search index.
+-rebuild-search-index      Re-builds the full text search index (potentially slow).
+-quiet                     Does not display any error or
+                           status message.
+-help                      Displays this help.
+</source>
+        <translation>使い方: assistant [オプション]
+
+-collectionFile file       デフォルトのコレクションファイルの代わりに使用する
+                           コレクションファイルを指定します。
+-showUrl url               表示するURLを指定します。
+-enableRemoteControl       Assistant をリモートから制御できるようにします。
+-show widget               表示するウィジェット(&quot;contents&quot;、&quot;index&quot;、
+                           &quot;bookmarks&quot;、&quot;search&quot;)を指定します。
+-activate widget           アクティブにするウィジェット(&quot;contents&quot;、
+                           &quot;index&quot;、&quot;bookmarks&quot;、&quot;search&quot;)を指定します。
+-hide widget               表示しないウィジェット(&quot;contents&quot;、&quot;index&quot;、
+                           &quot;bookmarks&quot;、&quot;search&quot;)を指定します。
+-register helpFile         コレクションファイルに登録する
+                           ヘルプファイル (.qch) を指定します。
+-unregister helpFile       コレクションファイルから登録を解除する
+                           ヘルプファイル (.qch) を指定します。
+-setCurrentFilter filter   フィルタをアクティブなフィルタとして設定します。
+-remove-search-index       全文検索インデックスを削除します。
+-rebuild-search-index      全文検索インデックスをリビルドします。(時間を要する場合があります)
+-quiet                     エラーやステータスメッセージを表示しません。
+-help                      このヘルプを表示します。
+</translation>
+    </message>
+    <message>
         <source>Unknown option: %1</source>
         <translation>不明なオプション: %1</translation>
     </message>
@@ -417,6 +482,56 @@ Reason:
     </message>
 </context>
 <context>
+    <name>ConversionWizard</name>
+    <message>
+        <source>Help Conversion Wizard</source>
+        <translation>ヘルプ変換ウィザード</translation>
+    </message>
+    <message>
+        <source>Converting %1...</source>
+        <translation>%1 を変換中...</translation>
+    </message>
+    <message>
+        <source>Writing help collection file...</source>
+        <translation>ヘルプコレクションファイルに書き出し中...</translation>
+    </message>
+    <message>
+        <source>Done.</source>
+        <translation>完了.</translation>
+    </message>
+</context>
+<context>
+    <name>FilesPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Files:</source>
+        <translation>ファイル:</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <source>Remove All</source>
+        <translation>すべて削除</translation>
+    </message>
+    <message>
+        <source>Unreferenced Files</source>
+        <translation>参照していないファイル</translation>
+    </message>
+    <message>
+        <source>Remove files which are neither referenced by a keyword nor by the TOC.</source>
+        <translation>キーワードと目次のどちらからも参照されていないファイルを削除します。</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; When removing images or stylesheets, be aware that those files are not directly referenced by the .adp or .dcf file.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;b&gt;警告:&lt;/b&gt; 画像やスタイルシートを削除する時は、それらが .adp ファイルや .dcf ファイルから直接参照されていないか注意してください。&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>FilterNameDialogClass</name>
     <message>
         <source>Add Filter Name</source>
@@ -428,6 +543,66 @@ Reason:
     </message>
 </context>
 <context>
+    <name>FilterPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Filter attributes for current documentation (comma separated list):</source>
+        <translation>現在のドキュメントのフィルタ属性 (カンマ区切りリスト):</translation>
+    </message>
+    <message>
+        <source>Custom Filters</source>
+        <translation>カスタム フィルタ</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>追加</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation>フィルタ設定</translation>
+    </message>
+    <message>
+        <source>Specify the filter attributes for the documentation. If filter attributes are used, also define a custom filter for it. Both the filter attributes and the custom filters are optional.</source>
+        <translation>ドキュメントのフィルタ属性を指定します。フィルタ属性を使用する場合、使用するカスタムフィルタもあわせて指定する必要があります。フィルタ属性もカスタムフィルタも必須ではありません。</translation>
+    </message>
+    <message>
+        <source>Filter Name</source>
+        <translation>フィルタ名</translation>
+    </message>
+    <message>
+        <source>Filter Attributes</source>
+        <translation>フィルタ属性</translation>
+    </message>
+    <message>
+        <source>The custom filter &apos;%1&apos; is defined multiple times.</source>
+        <translation>カスタムフィルタ &apos;%1&apos; が複数回定義されています。</translation>
+    </message>
+    <message>
+        <source>The attributes for custom filter &apos;%1&apos; are defined multiple times.</source>
+        <translation>カスタムフィルタ &apos;%1&apos; の属性が複数回定義されています。</translation>
+    </message>
+    <message>
+        <source>unfiltered</source>
+        <comment>list of available documentation</comment>
+        <translation>フィルタなし</translation>
+    </message>
+</context>
+<context>
     <name>FindWidget</name>
     <message>
         <source>Previous</source>
@@ -451,6 +626,17 @@ Reason:
     </message>
 </context>
 <context>
+    <name>FinishPage</name>
+    <message>
+        <source>Converting File</source>
+        <translation>ファイルを変換中</translation>
+    </message>
+    <message>
+        <source>Creating the new Qt help files from the old ADP file.</source>
+        <translation>古い ADP ファイルから新しい Qt ヘルプファイルを作成しています。</translation>
+    </message>
+</context>
+<context>
     <name>FontPanel</name>
     <message>
         <source>Font</source>
@@ -474,6 +660,59 @@ Reason:
     </message>
 </context>
 <context>
+    <name>GeneralPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Namespace:</source>
+        <translation>名前空間:</translation>
+    </message>
+    <message>
+        <source>Virtual Folder:</source>
+        <translation>仮想フォルダ:</translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation>概要設定</translation>
+    </message>
+    <message>
+        <source>Specify the namespace and the virtual folder for the documentation.</source>
+        <translation>ドキュメントの名前空間や仮想フォルダを指定します。</translation>
+    </message>
+    <message>
+        <source>Namespace Error</source>
+        <translation>名前空間エラー</translation>
+    </message>
+    <message>
+        <source>The namespace contains some invalid characters.</source>
+        <translation>名前空間にいくつか無効な文字が含まれています。</translation>
+    </message>
+    <message>
+        <source>Virtual Folder Error</source>
+        <translation>仮想フォルダ エラー</translation>
+    </message>
+    <message>
+        <source>The virtual folder contains some invalid characters.</source>
+        <translation>仮想フォルダにいくつか無効な文字が含まれています。</translation>
+    </message>
+</context>
+<context>
+    <name>HelpEngineWrapper</name>
+    <message>
+        <source>Unfiltered</source>
+        <translation>フィルタなし</translation>
+    </message>
+</context>
+<context>
+    <name>HelpGenerator</name>
+    <message>
+        <source>Warning: %1</source>
+        <translation>警告: %1</translation>
+    </message>
+</context>
+<context>
     <name>HelpViewer</name>
     <message>
         <source>Help</source>
@@ -485,7 +724,7 @@ Reason:
     </message>
     <message>
         <source>&lt;title&gt;about:blank&lt;/title&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;title&gt;about:blank&lt;/title&gt;</translation>
     </message>
     <message>
         <source>&lt;title&gt;Error 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;The page could not be found&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</source>
@@ -511,6 +750,40 @@ Reason:
     </message>
 </context>
 <context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Wizard Assistant&lt;/b&gt;&lt;/center&gt;</source>
+        <translation>&lt;center&gt;&lt;b&gt;ウィザード アシスタント&lt;/b&gt;&lt;/center&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>IdentifierPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Create identifiers</source>
+        <translation>IDを作成</translation>
+    </message>
+    <message>
+        <source>Global prefix:</source>
+        <translation>グローバルな接頭辞:</translation>
+    </message>
+    <message>
+        <source>Inherit prefix from file names</source>
+        <translation>ファイル名を受け継いだ接頭辞</translation>
+    </message>
+    <message>
+        <source>Identifiers</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>This page allows you to create identifiers from the keywords found in the .adp or .dcf file.</source>
+        <translation>このページで .adp や .dcf ファイルに見つかったキーワードにIDを付与する事ができます。</translation>
+    </message>
+</context>
+<context>
     <name>IndexWindow</name>
     <message>
         <source>&amp;Look for:</source>
@@ -526,6 +799,53 @@ Reason:
     </message>
 </context>
 <context>
+    <name>InputPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>File name:</source>
+        <translation>ファイル名:</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <source>Input File</source>
+        <translation>取り込むファイルの指定</translation>
+    </message>
+    <message>
+        <source>Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format.</source>
+        <translation>新たに Qt ヘルプ プロジェクト/コレクションフォーマットに変換したい .adp / .dcf ファイルを指定してください。</translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation>ファイルを開く</translation>
+    </message>
+    <message>
+        <source>Qt Help Files (*.adp *.dcf)</source>
+        <translation>Qt ヘルプ ファイル (*.adp *.dcf)</translation>
+    </message>
+    <message>
+        <source>File Open Error</source>
+        <translation>ファイル オープン エラー</translation>
+    </message>
+    <message>
+        <source>The specified file could not be opened!</source>
+        <translation>指定されたファイルを開く事ができません!</translation>
+    </message>
+    <message>
+        <source>File Parsing Error</source>
+        <translation>ファイル パース エラー</translation>
+    </message>
+    <message>
+        <source>Parsing error in line %1!</source>
+        <translation>%1 行目でパース エラーです!</translation>
+    </message>
+</context>
+<context>
     <name>InstallDialog</name>
     <message>
         <source>Install Documentation</source>
@@ -713,6 +1033,10 @@ Reason:
         <translation>ホーム(&amp;H)</translation>
     </message>
     <message>
+        <source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</source>
+        <translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;バージョン %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</translation>
+    </message>
+    <message>
         <source>Could not register file &apos;%1&apos;: %2</source>
         <translation>ファイル &apos;%1&apos; を登録できませんでした: %2</translation>
     </message>
@@ -854,6 +1178,92 @@ Reason:
     </message>
 </context>
 <context>
+    <name>OutputPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Project file name:</source>
+        <translation>プロジェクト ファイル名:</translation>
+    </message>
+    <message>
+        <source>Collection file name:</source>
+        <translation>コレクション ファイル名:</translation>
+    </message>
+    <message>
+        <source>Output File Names</source>
+        <translation>出力するファイル名の指定</translation>
+    </message>
+    <message>
+        <source>Specify the file names for the output files.</source>
+        <translation>出力するファイルのファイル名を指定してください。</translation>
+    </message>
+    <message>
+        <source>Convert...</source>
+        <translation>変換...</translation>
+    </message>
+    <message>
+        <source>Qt Help Project File</source>
+        <translation>Qt ヘルプ プロジェクト ファイル</translation>
+    </message>
+    <message>
+        <source>Qt Help Collection Project File</source>
+        <translation>Qt ヘルプ コレクション プロジェクト ファイル</translation>
+    </message>
+    <message>
+        <source>The specified file %1 already exist.
+
+Do you want to remove it?</source>
+        <translation>指定されたファイル %1 は既に存在します。
+
+元々あったファイルを削除しますか?</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+</context>
+<context>
+    <name>PathPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>File filters:</source>
+        <translation>ファイル フィルタ:</translation>
+    </message>
+    <message>
+        <source>Documentation source file paths:</source>
+        <translation>ドキュメントソースファイルパス:</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>追加</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <source>Source File Paths</source>
+        <translation>ソースファイルのパス</translation>
+    </message>
+    <message>
+        <source>Specify the paths where the sources files are located. By default, all files in those directories matched by the file filter will be included.</source>
+        <translation>ソースファイルが格納されているパスを指定してください。デフォルトではファイルフィルタに一致したディレクトリ内のすべてのファイルが含まれます。</translation>
+    </message>
+    <message>
+        <source>Source File Path</source>
+        <translation>ソースファイルのパス</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <source>Add Documentation</source>
@@ -988,6 +1398,175 @@ Reason:
     </message>
 </context>
 <context>
+    <name>QCollectionGenerator</name>
+    <message>
+        <source>Unknown token at line %1.</source>
+        <translation>%1 行目に未知のトークンがあります。</translation>
+    </message>
+    <message>
+        <source>Unknown token at line %1. Expected &quot;QtHelpCollectionProject&quot;.</source>
+        <translation>%1 行目の &quot;QtHelpCollectionProject&quot; が期待される箇所に未知のトークンがあります。</translation>
+    </message>
+    <message>
+        <source>Missing end tags.</source>
+        <translation>終了タグが不明です。</translation>
+    </message>
+    <message>
+        <source>Missing input or output file for help file generation.</source>
+        <translation>ヘルプファイルを生成する為の入力ファイルまたは出力ファイルが不明です。</translation>
+    </message>
+    <message>
+        <source>Missing output file name.</source>
+        <translation>出力先ファイル名が不明です。</translation>
+    </message>
+    <message>
+        <source>Qt Collection Generator version 1.0 (Qt %1)
+</source>
+        <translation>Qt コレクション ジェネレータ バージョン 1.0 (Qt %1)
+</translation>
+    </message>
+    <message>
+        <source>Missing collection config file.</source>
+        <translation>コレクション設定ファイルが見つかりません。</translation>
+    </message>
+    <message>
+        <source>
+Usage:
+
+qcollectiongenerator &lt;collection-config-file&gt; [options]
+
+  -o &lt;collection-file&gt;   Generates a collection file
+                         called &lt;collection-file&gt;. If
+                         this option is not specified
+                         a default name will be used.
+  -v                     Displays the version of
+                         qcollectiongenerator.
+
+</source>
+        <translation>
+使い方:
+
+qcollectiongenerator &lt;コレクション設定ファイル&gt; [オプション]
+
+  -o &lt;コレクションファイル&gt;   &lt;コレクションファイル&gt; という名前で
+                         コレクションファイルを生成します。
+                         このオプションが指定されていなかった場合は
+                         デフォルトのファイル名が使用されます。
+  -v                     qcollectiongenerator　のバージョンを表示します。
+
+</translation>
+    </message>
+    <message>
+        <source>Could not open %1.
+</source>
+        <translation>%1 を開けませんでした。
+</translation>
+    </message>
+    <message>
+        <source>Reading collection config file...
+</source>
+        <translation>コレクション設定ファイルを読み込んでいます...
+</translation>
+    </message>
+    <message>
+        <source>Collection config file error: %1
+</source>
+        <translation>コレクション設定ファイル エラー: %1
+</translation>
+    </message>
+    <message>
+        <source>Generating help for %1...
+</source>
+        <translation>%1 のヘルプを生成しています...
+</translation>
+    </message>
+    <message>
+        <source>Creating collection file...
+</source>
+        <translation>コレクションファイルを作成しています...
+</translation>
+    </message>
+    <message>
+        <source>The file %1 cannot be overwritten.
+</source>
+        <translation>ファイル %1 を上書きできません。
+</translation>
+    </message>
+    <message>
+        <source>Cannot open %1.
+</source>
+        <translation>%1 を開けません。
+</translation>
+    </message>
+    <message>
+        <source>Cannot open referenced image file %1.
+</source>
+        <translation>参照されている画像ファイル %1 を開けません。
+</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpGenerator</name>
+    <message>
+        <source>Missing output file name.</source>
+        <translation>出力先ファイル名が不明です。</translation>
+    </message>
+    <message>
+        <source>Qt Help Generator version 1.0 (Qt %1)
+</source>
+        <translation>Qt ヘルプ ジェネレータ バージョン 1.0 (Qt %1)
+</translation>
+    </message>
+    <message>
+        <source>Missing Qt help project file.</source>
+        <translation>Qt ヘルプ プロジェクト ファイルが見つかりません。</translation>
+    </message>
+    <message>
+        <source>
+Usage:
+
+qhelpgenerator &lt;help-project-file&gt; [options]
+
+  -o &lt;compressed-file&gt;   Generates a Qt compressed help
+                         file called &lt;compressed-file&gt;.
+                         If this option is not specified
+                         a default name will be used.
+  -c                     Checks whether all links in HTML files
+                         point to files in this help project.
+  -v                     Displays the version of 
+                         qhelpgenerator.
+
+</source>
+        <translation>
+使い方:
+
+qhelpgenerator &lt;ヘルププロジェクトファイル&gt; [オプション]
+
+  -o &lt;圧縮ファイル&gt;   &lt;圧縮ファイル&gt; という名前で Qt 圧縮 ヘルプ
+                         ファイルを生成します。
+                         このオプションが指定されていなかった場合は
+                         デフォルトのファイル名が使用されます。
+  -c                    HTML ファイル内のすべてのリンクがこのヘルプ
+                         プロジェクト内のファイルを指しているかどうかを
+                         チェックします。
+  -v                     qhelpgenerator のバージョンを表示します。
+
+</translation>
+    </message>
+    <message>
+        <source>Could not open %1.
+</source>
+        <translation>%1 を開けませんでした。
+</translation>
+    </message>
+    <message>
+        <source>Could not create output directory: %1
+</source>
+        <translation>出力ディレクトリを作成できませんでした: %1
+</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>The specified collection file does not exist!</source>
diff --git a/translations/designer_ja.ts b/translations/designer_ja.ts
index 7e1696f..2eb6cd9 100644
--- a/translations/designer_ja.ts
+++ b/translations/designer_ja.ts
@@ -25,6 +25,49 @@
     </message>
 </context>
 <context>
+    <name>AbstractItemEditor</name>
+    <message>
+        <source>Selectable</source>
+        <translation>選択可能</translation>
+    </message>
+    <message>
+        <source>Editable</source>
+        <translation>編集可能</translation>
+    </message>
+    <message>
+        <source>DragEnabled</source>
+        <translation>ドラッグ可能</translation>
+    </message>
+    <message>
+        <source>DropEnabled</source>
+        <translation>ドロップ可能</translation>
+    </message>
+    <message>
+        <source>UserCheckable</source>
+        <translation>チェック可能</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>有効</translation>
+    </message>
+    <message>
+        <source>Tristate</source>
+        <translation>3択</translation>
+    </message>
+    <message>
+        <source>Unchecked</source>
+        <translation>チェックなし</translation>
+    </message>
+    <message>
+        <source>PartiallyChecked</source>
+        <translation>部分的にチェックあり</translation>
+    </message>
+    <message>
+        <source>Checked</source>
+        <translation>チェックあり</translation>
+    </message>
+</context>
+<context>
     <name>AddLinkDialog</name>
     <message>
         <source>Insert Link</source>
@@ -844,6 +887,7 @@ Parsing grid layout minimum size values</extracomment>
     <name>FormEditorOptionsPage</name>
     <message>
         <source>%1 %</source>
+        <extracomment>Zoom percentage</extracomment>
         <translation>%1 %</translation>
     </message>
     <message>
@@ -969,7 +1013,7 @@ Parsing grid layout minimum size values</extracomment>
     <message>
         <source>XX Icon Selected off</source>
         <extracomment>Sample string to determinate the width for the first column of the list item property browser</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>XX Icon Selected off</translation>
     </message>
 </context>
 <context>
@@ -2502,6 +2546,10 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtLocalePropertyManager</name>
     <message>
+        <source>&lt;Invalid&gt;</source>
+        <translation>&lt;無効&gt;</translation>
+    </message>
+    <message>
         <source>%1, %2</source>
         <translation>%1, %2</translation>
     </message>
@@ -4720,6 +4768,14 @@ Please select another name.</source>
         <translation>新しくインストールされたカスタムウィジェットプラグインをスキャンします。</translation>
     </message>
     <message>
+        <source>Loaded Plugins</source>
+        <translation>ロード済みプラグイン</translation>
+    </message>
+    <message>
+        <source>Failed Plugins</source>
+        <translation>失敗したプラグイン</translation>
+    </message>
+    <message>
         <source>Qt Designer couldn&apos;t find any plugins</source>
         <translation>プラグインは見つかりませんでした</translation>
     </message>
diff --git a/translations/linguist_ja.ts b/translations/linguist_ja.ts
old mode 100644
new mode 100755
index abd32a0..2f948e8
--- a/translations/linguist_ja.ts
+++ b/translations/linguist_ja.ts
@@ -256,6 +256,186 @@ Will assume a single universal form.</source>
     </message>
 </context>
 <context>
+    <name>LConvert</name>
+    <message>
+        <source>
+Usage:
+    lconvert [options] &lt;infile&gt; [&lt;infile&gt;...]
+
+lconvert is part of Qt&apos;s Linguist tool chain. It can be used as a
+stand-alone tool to convert and filter translation data files.
+The following file formats are supported:
+
+%1
+If multiple input files are specified, they are merged with
+translations from later files taking precedence.
+
+Options:
+    -h
+    --help  Display this information and exit.
+
+    -i &lt;infile&gt;
+    --input-file &lt;infile&gt;
+           Specify input file. Use if &lt;infile&gt; might start with a dash.
+           This option can be used several times to merge inputs.
+           May be &apos;-&apos; (standard input) for use in a pipe.
+
+    -o &lt;outfile&gt;
+    --output-file &lt;outfile&gt;
+           Specify output file. Default is &apos;-&apos; (standard output).
+
+    -if &lt;informat&gt;
+    --input-format &lt;format&gt;
+           Specify input format for subsequent &lt;infile&gt;s.
+           The format is auto-detected from the file name and defaults to &apos;ts&apos;.
+
+    -of &lt;outformat&gt;
+    --output-format &lt;outformat&gt;
+           Specify output format. See -if.
+
+    --input-codec &lt;codec&gt;
+           Specify encoding for QM and PO input files. Default is &apos;Latin1&apos;
+           for QM and &apos;UTF-8&apos; for PO files. UTF-8 is always tried as well for
+           QM, corresponding to the possible use of the trUtf8() function.
+
+    --output-codec &lt;codec&gt;
+           Specify encoding for PO output files. Default is &apos;UTF-8&apos;.
+
+    --drop-tags &lt;regexp&gt;
+           Drop named extra tags when writing TS or XLIFF files.
+           May be specified repeatedly.
+
+    --drop-translations
+           Drop existing translations and reset the status to &apos;unfinished&apos;.
+           Note: this implies --no-obsolete.
+
+    --source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the source strings. Defaults to
+           POSIX if not specified and the file does not name it yet.
+
+    --target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the translation.
+           The target language is guessed from the file name if this option
+           is not specified and the file contents name no language yet.
+
+    --no-obsolete
+           Drop obsolete messages.
+
+    --no-finished
+           Drop finished messages.
+
+    --sort-contexts
+           Sort contexts in output TS file alphabetically.
+
+    --locations {absolute|relative|none}
+           Override how source code references are saved in TS files.
+           Default is absolute.
+
+    --no-ui-lines
+           Drop line numbers from references to UI files.
+
+    --verbose
+           be a bit more verbose
+
+Long options can be specified with only one leading dash, too.
+
+Return value:
+    0 on success
+    1 on command line parse failures
+    2 on read failures
+    3 on write failures
+</source>
+        <translation type="unfinished">
+使い方:
+    lconvert [オプション] &lt;入力ファイル&gt; [&lt;入力ファイル&gt;...]
+
+lconvert は Qt Linguist ツールチェインの一部です。
+翻訳データファイルを変換したりフィルタリングしたりする事が
+できるスタンドアロンのツールです。
+サポートしているファイル形式は以下の通りです:
+
+%1
+入力ファイルが複数個指定された場合、末尾のファイルほど
+優先度が高いものとして翻訳データをマージします。
+
+オプション:
+    -h
+    --help  このヘルプを表示して終了します。
+
+    -i &lt;入力ファイル&gt;
+    --input-file &lt;入力ファイル&gt;
+           入力ファイルを指定します。&lt;入力ファイル&gt; の指定はダッシュ記号で始まっていてもよいです。
+           This option can be used several times to merge inputs.
+           May be &apos;-&apos; (標準入力) for use in a pipe.
+
+    -o &lt;出力ファイル&gt;
+    --output-file &lt;出力ファイル&gt;
+           出力ファイルを指定します。デフォルトは &apos;-&apos; (標準出力) です。
+
+    -if &lt;入力形式&gt;
+    --input-format &lt;入力形式&gt;
+           後続の &lt;入力ファイル&gt; の入力形式を指定します。
+           形式はファイル名から自動検知され、デフォルトでは &apos;ts&apos; となります。
+
+    -of &lt;出力形式&gt;
+    --output-format &lt;出力形式&gt;
+           出力形式を指定します。-if を参照してください。
+
+    --input-codec &lt;コーデック&gt;
+           Specify encoding for QM and PO input files. Default is &apos;Latin1&apos;
+           for QM and &apos;UTF-8&apos; for PO files. UTF-8 is always tried as well for
+           QM, corresponding to the possible use of the trUtf8() function.
+
+    --output-codec &lt;コーデック&gt;
+           Specify encoding for PO output files.デフォルトは &apos;UTF-8&apos; です。
+
+    --drop-tags &lt;正規表現&gt;
+           Drop named extra tags when writing TS or XLIFF files.
+           May be specified repeatedly.
+
+    --drop-translations
+           Drop existing translations and reset the status to &apos;unfinished&apos;.
+           注意: --no-obsolete と同等です。
+
+    --source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the source strings. Defaults to
+           POSIX if not specified and the file does not name it yet.
+
+    --target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the translation.
+           The target language is guessed from the file name if this option
+           is not specified and the file contents name no language yet.
+
+    --no-obsolete
+           未使用のメッセージを取り除きます。
+
+    --no-finished
+           完了しているメッセージを取り除きます。
+
+    --sort-contexts
+           出力する TS ファイル内のコンテキストをアルファベット順にソートします。
+
+    --locations {absolute|relative|none}
+           Override how source code references are saved in TS files.
+           Default is absolute.
+
+    --no-ui-lines
+           UI ファイルを参照している行番号を取り除きます。
+
+    --verbose
+           be a bit more verbose
+
+長すぎるオプションの指定はダッシュ記号で括る事で1つにできます。
+
+戻り値:
+    0 成功
+    1 コマンドラインパース失敗
+    2 読み込み失敗
+    3 書き込み失敗
+</translation>
+    </message>
+</context>
+<context>
     <name>LRelease</name>
     <message numerus="yes">
         <source>Dropped %n message(s) which had no ID.</source>
@@ -281,6 +461,735 @@ Will assume a single universal form.</source>
             <numerusform>     %n 件の未翻訳のソーステキストを無視しました</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Usage:
+    lrelease [options] project-file
+    lrelease [options] ts-files [-qm qm-file]
+
+lrelease is part of Qt&apos;s Linguist tool chain. It can be used as a
+stand-alone tool to convert XML-based translations files in the TS
+format into the &apos;compiled&apos; QM format used by QTranslator objects.
+
+Options:
+    -help  Display this information and exit
+    -idbased
+           Use IDs instead of source strings for message keying
+    -compress
+           Compress the QM files
+    -nounfinished
+           Do not include unfinished translations
+    -removeidentical
+           If the translated text is the same as
+           the source text, do not include the message
+    -markuntranslated &lt;prefix&gt;
+           If a message has no real translation, use the source text
+           prefixed with the given string instead
+    -silent
+           Do not explain what is being done
+    -version
+           Display the version of lrelease and exit
+</source>
+        <translation type="unfinished">使い方:
+    lrelease [オプション] project-file
+    lrelease [オプション] ts-files [-qm qm-file]
+
+lrelease is part of Qt&apos;s Linguist tool chain. It can be used as a
+stand-alone tool to convert XML-based translations files in the TS
+format into the &apos;compiled&apos; QM format used by QTranslator objects.
+
+オプション:
+    -help  このヘルプを表示して終了します
+    -idbased
+           メッセージのキーとして、ソース中の文字列を使用する代わりにIDを使用します
+    -compress
+           QM ファイルを圧縮します
+    -nounfinished
+           未完了の翻訳をインクルードしません
+    -removeidentical
+           If the translated text is the same as
+           the source text, do not include the message
+    -markuntranslated &lt;プレフィクス&gt;
+           If a message has no real translation, use the source text
+           prefixed with the given string instead
+    -silent
+           完了した事を通知しません
+    -version
+           lrelease のバージョンを表示して終了します
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: %1</source>
+        <translation>lrelease エラー: %1</translation>
+    </message>
+    <message>
+        <source>Updating &apos;%1&apos;...
+</source>
+        <translation>&apos;%1&apos; を更新しています...
+</translation>
+    </message>
+    <message>
+        <source>Removing translations equal to source text in &apos;%1&apos;...
+</source>
+        <translation>&apos;%1&apos; のソーステキストと等しい翻訳を削除しています...
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot create &apos;%1&apos;: %2
+</source>
+        <translation>lrelease エラー: &apos;%1&apos; を作成できません: %2
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot save &apos;%1&apos;: %2</source>
+        <translation>lrelease エラー: &apos;%1&apos; を保存できません: %2</translation>
+    </message>
+    <message>
+        <source>lrelease version %1
+</source>
+        <translation>lrelease バージョン %1
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot read project file &apos;%1&apos;.
+</source>
+        <translation>lrelease エラー: プロジェクトファイル &apos;%1&apos; が読めません。
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot process project file &apos;%1&apos;.
+</source>
+        <translation>lrelease エラー: プロジェクトファイル &apos;%1&apos; を処理できません。
+</translation>
+    </message>
+    <message>
+        <source>lrelease warning: Met no &apos;TRANSLATIONS&apos; entry in project file &apos;%1&apos;
+</source>
+        <translation>lrelease 警告: プロジェクトファイル &apos;%1&apos; に &apos;TRANSLATIONS&apos; エントリが見つかりません
+</translation>
+    </message>
+</context>
+<context>
+    <name>LUpdate</name>
+    <message>
+        <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
+</source>
+        <translation>#if を使っている部分で、#if 〜 #else の間の丸括弧/角括弧/中括弧の個数が一致していません
+</translation>
+    </message>
+    <message>
+        <source>Parenthesis/brace mismatch between #if and #else branches; using #if branch
+</source>
+        <translation>#if を使っている部分で、#if 〜 #else の間の丸括弧/中括弧の個数が一致していません
+</translation>
+    </message>
+    <message>
+        <source>Unterminated C++ comment
+</source>
+        <translation>終了していないC++ コメント
+</translation>
+    </message>
+    <message>
+        <source>Unterminated C++ string
+</source>
+        <translation>終了していない C++ 文字列
+</translation>
+    </message>
+    <message>
+        <source>Excess closing brace in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>C++ コード内で閉じ中括弧の数が一致していません (もしくは C++ プリプロセッサが乱用されています)
+</translation>
+    </message>
+    <message>
+        <source>Excess closing parenthesis in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>C++ コード内で閉じ丸括弧の数が一致していません (もしくは C++ プリプロセッサが乱用されています)
+</translation>
+    </message>
+    <message>
+        <source>Excess closing bracket in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>C++ コード内で閉じ角括弧の数が一致していません (もしくは C++ プリプロセッサが乱用されています)
+</translation>
+    </message>
+    <message>
+        <source>circular inclusion of %1
+</source>
+        <translation>%1 を循環インクルードしています
+</translation>
+    </message>
+    <message>
+        <source>Cannot open %1: %2
+</source>
+        <translation>%1 を開けません: %2
+</translation>
+    </message>
+    <message>
+        <source>//% cannot be used with tr() / QT_TR_NOOP(). Ignoring
+</source>
+        <translation>//% は tr() または QT_TR_NOOP() と併用できません。無視します
+</translation>
+    </message>
+    <message>
+        <source>Qualifying with unknown namespace/class %1::%2
+</source>
+        <translation>未知の名前空間またはクラス %1::%2 で修飾されています
+</translation>
+    </message>
+    <message>
+        <source>tr() cannot be called without context
+</source>
+        <translation>コンテキストなしで tr() は呼び出せません
+</translation>
+    </message>
+    <message>
+        <source>Class &apos;%1&apos; lacks Q_OBJECT macro
+</source>
+        <translation>クラス &apos;%1&apos; は Q_OBJECT マクロが不足しています
+</translation>
+    </message>
+    <message>
+        <source>It is not recommended to call tr() from within a constructor &apos;%1::%2&apos;
+</source>
+        <translation>コンストラクタ &apos;%1::%2&apos; 内での tr() 呼び出しは推奨されていません
+</translation>
+    </message>
+    <message>
+        <source>//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring
+</source>
+        <translation>//% は translate() または QT_TRANSLATE_NOOP() と併用できません。無視します
+</translation>
+    </message>
+    <message>
+        <source>//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring
+</source>
+        <translation>//= は qtTrId() または QT_TRID_NOOP() と併用できません。無視します
+</translation>
+    </message>
+    <message>
+        <source>Unexpected character in meta string
+</source>
+        <translation>メタ文字列内に予期せぬ文字
+</translation>
+    </message>
+    <message>
+        <source>Unterminated meta string
+</source>
+        <translation>終了していない メタ文字列
+</translation>
+    </message>
+    <message>
+        <source>Cannot invoke tr() like this
+</source>
+        <translation>this のように tr() を呼び出す事はできません
+</translation>
+    </message>
+    <message>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation>未使用のメタデータを破棄しています
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening brace in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>C++ コード内で開き中括弧の数が一致していません (もしくは C++ プリプロセッサが乱用されています)
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening parenthesis in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>C++ コード内で開き丸括弧の数が一致していません (もしくは C++ プリプロセッサが乱用されています)
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening bracket in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>C++ コード内で開き角括弧の数が一致していません (もしくは C++ プリプロセッサが乱用されています)
+</translation>
+    </message>
+    <message>
+        <source>Cannot open %1: %2</source>
+        <translation>%1 を開けません: %2</translation>
+    </message>
+    <message>
+        <source>Unterminated Java comment.
+</source>
+        <translation>終了していない Java コメント。
+</translation>
+    </message>
+    <message>
+        <source>Invalid Unicode value.
+</source>
+        <translation>不正な Unicode 値です。
+</translation>
+    </message>
+    <message>
+        <source>Unterminated string.
+</source>
+        <translation>終了していない文字列。
+</translation>
+    </message>
+    <message>
+        <source>String used in translation can contain only literals concatenated with other literals, not expressions or numbers.
+</source>
+        <translation>翻訳で使用される文字列は、式や数字以外の他のリテラルと連結されたリテラルだけを含む事ができます。
+</translation>
+    </message>
+    <message>
+        <source>&apos;class&apos; must be followed by a class name.
+</source>
+        <translation>&apos;class&apos; に続くのはクラス名でなければなりません。
+</translation>
+    </message>
+    <message>
+        <source>Excess closing brace.
+</source>
+        <translation>余分な閉じ括弧です。
+</translation>
+    </message>
+    <message>
+        <source>&apos;package&apos; must be followed by package name.
+</source>
+        <translation>&apos;package&apos; に続くのはパッケージ名でなければなりません。
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening brace.
+</source>
+        <translation>開き括弧が一致していません。
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening parenthesis.
+</source>
+        <translation>開き丸括弧が一致していません。
+</translation>
+    </message>
+    <message>
+        <source>Usage:
+    lupdate [options] [project-file]...
+    lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
+
+lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
+messages from Qt UI files, C++, Java and JavaScript/QtScript source code.
+Extracted messages are stored in textual translation source files (typically
+Qt TS XML). New and modified messages can be merged into existing TS files.
+
+Options:
+    -help  Display this information and exit.
+    -no-obsolete
+           Drop all obsolete strings.
+    -extensions &lt;ext&gt;[,&lt;ext&gt;]...
+           Process files with the given extensions only.
+           The extension list must be separated with commas, not with whitespace.
+           Default: &apos;%1&apos;.
+    -pluralonly
+           Only include plural form messages.
+    -silent
+           Do not explain what is being done.
+    -no-sort
+           Do not sort contexts in TS files.
+    -no-recursive
+           Do not recursively scan the following directories.
+    -recursive
+           Recursively scan the following directories (default).
+    -I &lt;includepath&gt; or -I&lt;includepath&gt;
+           Additional location to look for include files.
+           May be specified multiple times.
+    -locations {absolute|relative|none}
+           Specify/override how source code references are saved in TS files.
+           Default is absolute.
+    -no-ui-lines
+           Do not record line numbers in references to UI files.
+    -disable-heuristic {sametext|similartext|number}
+           Disable the named merge heuristic. Can be specified multiple times.
+    -pro &lt;filename&gt;
+           Name of a .pro file. Useful for files with .pro file syntax but
+           different file suffix. Projects are recursed into and merged.
+    -source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the source strings for new files.
+           Defaults to POSIX if not specified.
+    -target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the translations for new files.
+           Guessed from the file name if not specified.
+    -ts &lt;ts-file&gt;...
+           Specify the output file(s). This will override the TRANSLATIONS
+           and nullify the CODECFORTR from possibly specified project files.
+    -codecfortr &lt;codec&gt;
+           Specify the codec assumed for tr() calls. Effective only with -ts.
+    -version
+           Display the version of lupdate and exit.
+    @lst-file
+           Read additional file names (one per line) from lst-file.
+</source>
+        <translation type="unfinished">使い方:
+    lupdate [オプション] [プロジェクトファイル]...
+    lupdate [オプション] [source-file|path|@lst-file]... -ts ts-files|@lst-file
+
+lupdate は Qt&apos; Linguist ツールチェインの一部です。Qt UI ファイル、C++ 、Java、
+JavaScript/QtScript のソースコードからメッセージを抽出します。
+Extracted messages are stored in textual translation source files (typically
+Qt TS XML). 新しく追加されたり変更されたメッセージは既存の TS ファイル内のメッセージから
+マージされます。
+
+オプション:
+    -help  このヘルプを表示して終了します。
+    -no-obsolete
+           すべての未使用の文字列を取り除きます。
+    -extensions &lt;ext&gt;[,&lt;ext&gt;]...
+           与えられた拡張子のファイルだけ処理します。
+           拡張子のリストはカンマで区切り、空白スペースを含んではいけません。
+           デフォルト: &apos;%1&apos;
+    -pluralonly
+           複数形のメッセージだけインクルードします。
+    -silent
+           完了した事を通知しません
+    -no-sort
+           TS ファイル内のコンテキストをソートしません。
+    -no-recursive
+           ディレクトリ内を再帰的に処理しません。
+    -recursive
+           ディレクトリ内を再帰的に処理します。(デフォルト)
+    -I &lt;includepath&gt; or -I&lt;includepath&gt;
+           Additional location to look for include files.
+           May be specified multiple times.
+    -locations {absolute|relative|none}
+           Specify/override how source code references are saved in TS files.
+           Default is absolute.
+    -no-ui-lines
+           UI ファイルを参照する行番号を記録しません。
+    -disable-heuristic {sametext|similartext|number}
+           Disable the named merge heuristic. Can be specified multiple times.
+    -pro &lt;ファイル名&gt;
+           .pro ファイルの名前を指定します。Useful for files with .pro file syntax but
+           different file suffix. Projects are recursed into and merged.
+    -source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the source strings for new files.
+           Defaults to POSIX if not specified.
+    -target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the translations for new files.
+           Guessed from the file name if not specified.
+    -ts &lt;ts-file&gt;...
+           出力ファイルを指定します。This will override the TRANSLATIONS
+           and nullify the CODECFORTR from possibly specified project files.
+    -codecfortr &lt;codec&gt;
+           Specify the codec assumed for tr() calls. Effective only with -ts.
+    -version
+           lupdate のバージョン情報を表示して終了します。
+    @lst-file
+           Read additional file names (one per line) from lst-file.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
+</source>
+        <translation>lupdate 警告: tr() &apos;%1&apos; のコーデックと既存のファイルのコーデック &apos;%2&apos; が一致しません。問題が発生したようです。
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: Specified target language &apos;%1&apos; disagrees with existing file&apos;s language &apos;%2&apos;. Ignoring.
+</source>
+        <translation>lupdate 警告: 指定されたターゲット言語 &apos;%1&apos; と既存のファイルの言語 &apos;%2&apos; が一致しません。無視されます。
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: Specified source language &apos;%1&apos; disagrees with existing file&apos;s language &apos;%2&apos;. Ignoring.
+</source>
+        <translation>lupdate 警告: 指定されたソース言語 &apos;%1&apos; と既存のファイルの言語 &apos;%2&apos; が一致しません。無視されます。
+</translation>
+    </message>
+    <message>
+        <source>Updating &apos;%1&apos;...
+</source>
+        <translation>&apos;%1&apos; を更新しています...
+</translation>
+    </message>
+    <message>
+        <source>Stripping non plural forms in &apos;%1&apos;...
+</source>
+        <translation>&apos;%1&apos; 内の複数形以外のメッセージを取り除いています...
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: Codec for source &apos;%1&apos; is invalid. Falling back to codec for tr().
+</source>
+        <translation>lupdate 警告: ソース &apos;%1&apos; のコーデックは不正です。コーデックを元に戻します。
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: TS files from command line will override TRANSLATIONS in %1.
+</source>
+        <translation>lupdate 警告: コマンドラインで指定された TS ファイルは %1 の TRANSLATIONS を上書きます。
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: TS files from command line prevent recursing into %1.
+</source>
+        <translation>lupdate 警告: コマンドラインで指定された TS ファイルは %1 内で再起的に処理するのを妨げます。
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: no TS files specified. Only diagnostics will be produced for &apos;%1&apos;.
+</source>
+        <translation>lupdate 警告: TS ファイルが指定されていません。&apos;%1&apos; は診断のみ行われます。
+</translation>
+    </message>
+    <message>
+        <source>The option -target-language requires a parameter.
+</source>
+        <translation>パラメータに -target-language オプションが必要です。
+</translation>
+    </message>
+    <message>
+        <source>The option -source-language requires a parameter.
+</source>
+        <translation>パラメータに -source-language オプションが必要です。
+</translation>
+    </message>
+    <message>
+        <source>The option -disable-heuristic requires a parameter.
+</source>
+        <translation>パラメーターに -disable-heuristic オプションが必要です。
+</translation>
+    </message>
+    <message>
+        <source>Invalid heuristic name passed to -disable-heuristic.
+</source>
+        <translation>-disable-heuristic に不正なヒューリスティック名が渡されています。
+</translation>
+    </message>
+    <message>
+        <source>The option -locations requires a parameter.
+</source>
+        <translation>パラメータに -locations オプションが必要です。
+</translation>
+    </message>
+    <message>
+        <source>Invalid parameter passed to -locations.
+</source>
+        <translation>-locations に不正なパラメータが渡されています。
+</translation>
+    </message>
+    <message>
+        <source>The -codecfortr option should be followed by a codec name.
+</source>
+        <translation>-codecfortr オプションの後ろに続けてコーデック名があるべきです。
+</translation>
+    </message>
+    <message>
+        <source>The -extensions option should be followed by an extension list.
+</source>
+        <translation>-extensions オプションの後ろに続けて拡張リストがあるべきです。
+</translation>
+    </message>
+    <message>
+        <source>The -pro option should be followed by a filename of .pro file.
+</source>
+        <translation>-pro オプションの後ろに続けて .pro ファイルのファイル名があるべきです。
+</translation>
+    </message>
+    <message>
+        <source>The -I option should be followed by a path.
+</source>
+        <translation>-l オプションの後ろに続けてパスがあるべきです。
+</translation>
+    </message>
+    <message>
+        <source>Unrecognized option &apos;%1&apos;.
+</source>
+        <translation>&apos;%1&apos; は認識できないオプションです。
+</translation>
+    </message>
+    <message>
+        <source>lupdate error: List file &apos;%1&apos; is not readable.
+</source>
+        <translation>lupdate エラー: リストファイル &apos;%1&apos; が読めません。
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: For some reason, &apos;%1&apos; is not writable.
+</source>
+        <translation>lupdate 警告: いくつかの理由により &apos;%1&apos; は書き込みできません。
+</translation>
+    </message>
+    <message>
+        <source>lupdate error: File &apos;%1&apos; has no recognized extension.
+</source>
+        <translation>lupdate エラー: ファイル &apos;%1&apos; は拡張として認識できません。
+</translation>
+    </message>
+    <message>
+        <source>lupdate error: File &apos;%1&apos; does not exist.
+</source>
+        <translation>lupdate エラー: ファイル &apos;%1&apos; が存在しません。
+</translation>
+    </message>
+    <message>
+        <source>Scanning directory &apos;%1&apos;...
+</source>
+        <translation>ディレクトリ &apos;%1&apos; をスキャンしています...
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: -target-language usually only makes sense with exactly one TS file.
+</source>
+        <translation>lupdate 警告: -target-language は通常1つの TS ファイルにだけ意味を持ちます。
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: -codecfortr has no effect without -ts.
+</source>
+        <translation>lupdate 警告: -ts 指定なしでは -codecfortr は何の効果もありません。
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: no TS files specified. Only diagnostics will be produced.
+</source>
+        <translation>lupdate 警告: TS ファイルが指定されていません。診断のみ行われます。
+</translation>
+    </message>
+    <message>
+        <source>lupdate error: Both project and source files / include paths specified.
+</source>
+        <translation>lupdate エラー: プロジェクトとソースファイルまたはインクルードパスの両方が指定されています。
+</translation>
+    </message>
+    <message numerus="yes">
+        <source>    Found %n source text(s) (%1 new and %2 already existing)
+</source>
+        <translation>
+            <numerusform>    %n 件のソーステキストが見つかりました (新規: %1 件、既存: %2 件)
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Removed %n obsolete entries
+</source>
+        <translation>
+            <numerusform>    %n 件の未使用のエントリを削除しました
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Kept %n obsolete entries
+</source>
+        <translation>
+            <numerusform>    %n 件の未使用のエントリを残しました
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Number heuristic provided %n translation(s)
+</source>
+        <translation>
+            <numerusform>    数値ヒューリスティックは %n 件の翻訳を提供しました
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Same-text heuristic provided %n translation(s)
+</source>
+        <translation>
+            <numerusform>    同一テキスト ヒューリスティックは %n 件の翻訳を提供しました
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Similar-text heuristic provided %n translation(s)
+</source>
+        <translation>
+            <numerusform>    類似ヒューリスティックは %n 件の翻訳を提供しました
+</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Illegal character</source>
+        <translation>無効な文字</translation>
+    </message>
+    <message>
+        <source>Unclosed string at end of line</source>
+        <translation>ファイルの終端までに閉じられていない文字列</translation>
+    </message>
+    <message>
+        <source>Illegal escape squence</source>
+        <translation>無効なエスケープシーケンス</translation>
+    </message>
+    <message>
+        <source>Illegal unicode escape sequence</source>
+        <translation>無効な Unicode エスケープシーケンス</translation>
+    </message>
+    <message>
+        <source>Unclosed comment at end of file</source>
+        <translation>ファイルの終端までに閉じられていないコメント</translation>
+    </message>
+    <message>
+        <source>Illegal syntax for exponential number</source>
+        <translation>指数番号の構文が不正です</translation>
+    </message>
+    <message>
+        <source>Identifier cannot start with numeric literal</source>
+        <translation>識別子の先頭に数字を使用する事はできません</translation>
+    </message>
+    <message>
+        <source>Unterminated regular expression literal</source>
+        <translation>終了していない正規表現リテラル</translation>
+    </message>
+    <message>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation>//% は %1() と併用できません。無視します
+</translation>
+    </message>
+    <message>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation>%1() には最低でも2個の引数が必要です。
+</translation>
+    </message>
+    <message>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation>%1(): 両方の引数は文字列リテラルである必要があります。
+</translation>
+    </message>
+    <message>
+        <source>%1() requires at least one argument.
+</source>
+        <translation>%1() は最低でも1個の引数が必要です。
+</translation>
+    </message>
+    <message>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation>%1(): 翻訳するテキストはリテラル文字列である必要があります。
+</translation>
+    </message>
+    <message>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation>//= は %1() と併用できません。無視します
+</translation>
+    </message>
+    <message>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation>%1(): 識別子は文字列リテラルである必要があります。
+</translation>
+    </message>
+    <message>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation>期待されるトークン </translation>
+    </message>
+    <message>
+        <source>XML error: Parse error at line %1, column %2 (%3).</source>
+        <translation>XML エラー: %1 行目、%2 列目でパースエラー (%3)。</translation>
+    </message>
+    <message>
+        <source>Parse error in UI file</source>
+        <translation>UI ファイルでパースエラー</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -918,7 +1827,7 @@ All files (*)</source>
     </message>
     <message>
         <source>Save changes made to this Qt translation source file</source>
-        <translation>この Qt 翻訳ソースファイルに対して行われた変更を保存します。</translation>
+        <translation>この Qt 翻訳ソースファイルに対して行われた変更を保存します</translation>
     </message>
     <message>
         <source>Save changes made to this Qt translation source file into a new file.</source>
@@ -1279,6 +2188,13 @@ Line: %2</source>
     </message>
 </context>
 <context>
+    <name>PhraseBook</name>
+    <message>
+        <source>Parse error at line %1, column %2 (%3).</source>
+        <translation>%1 行目、%2 列目でパースエラー (%3)。</translation>
+    </message>
+</context>
+<context>
     <name>PhraseBookBox</name>
     <message>
         <source>(New Entry)</source>
@@ -1450,6 +2366,12 @@ Line: %2</source>
         <source>Qt Linguist &apos;Phrase Book&apos;</source>
         <translation>Qt Linguist &apos;フレーズ ブック&apos;</translation>
     </message>
+    <message>
+        <source>lupdate version %1
+</source>
+        <translation>lupdate バージョン %1
+</translation>
+    </message>
 </context>
 <context>
     <name>SourceCodeView</name>
diff --git a/translations/qt_ja.ts b/translations/qt_ja.ts
old mode 100644
new mode 100755
index 0812a64..095631e
--- a/translations/qt_ja.ts
+++ b/translations/qt_ja.ts
@@ -373,52 +373,52 @@ libgstreamer-plugins-base はインストールされていますか。</transla
     <message>
         <source>Decay HF ratio (%)</source>
         <extracomment>DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>高周波減衰率 (%)</translation>
     </message>
     <message>
         <source>Decay time (ms)</source>
         <extracomment>DecayTime: Time over which reverberation is diminished.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>減衰時間 (ms)</translation>
     </message>
     <message>
         <source>Density (%)</source>
         <extracomment>Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>密度 (%)</translation>
     </message>
     <message>
         <source>Diffusion (%)</source>
         <extracomment>Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>拡散度 (%)</translation>
     </message>
     <message>
         <source>Reflections delay (ms)</source>
         <extracomment>ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>反射遅延 (ms)</translation>
     </message>
     <message>
         <source>Reflections level (mB)</source>
         <extracomment>ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>反射レベル (mB)</translation>
     </message>
     <message>
         <source>Reverb delay (ms)</source>
         <extracomment>ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>リバーブ遅延 (ms)</translation>
     </message>
     <message>
         <source>Reverb level (mB)</source>
         <extracomment>ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>リバーブ レベル (mB)</translation>
     </message>
     <message>
         <source>Room HF level</source>
         <extracomment>RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>高周波室内レベル</translation>
     </message>
     <message>
         <source>Room level (mB)</source>
         <extracomment>RoomLevel: Master volume control for all reflected sound.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>室内レベル (mB)</translation>
     </message>
 </context>
 <context>
@@ -1531,7 +1531,7 @@ to
     </message>
     <message>
         <source>Invalid use of namespace</source>
-        <translation>無効なネームスペースの使用法です</translation>
+        <translation>無効な名前空間の使用法です</translation>
     </message>
     <message>
         <source>Not an attached property name</source>
@@ -1701,19 +1701,19 @@ to
     <name>QDeclarativeCompositeTypeManager</name>
     <message>
         <source>Resource %1 unavailable</source>
-        <translation>リソース %1 が利用できません</translation>
+        <translation type="obsolete">リソース %1 が利用できません</translation>
     </message>
     <message>
         <source>Namespace %1 cannot be used as a type</source>
-        <translation>ネームスペース %1 を型として使用することはできません</translation>
+        <translation type="obsolete">名前空間 %1 を型として使用することはできません</translation>
     </message>
     <message>
         <source>%1 %2</source>
-        <translation>%1 %2</translation>
+        <translation type="obsolete">%1 %2</translation>
     </message>
     <message>
         <source>Type %1 unavailable</source>
-        <translation>型 %1 が利用できません</translation>
+        <translation type="obsolete">型 %1 が利用できません</translation>
     </message>
 </context>
 <context>
@@ -1801,15 +1801,15 @@ to
     </message>
     <message>
         <source>import &quot;%1&quot; has no qmldir and no namespace</source>
-        <translation>import する &quot;%1&quot; に qmldir もネームスペースもありません</translation>
+        <translation>import する &quot;%1&quot; に qmldir も名前空間もありません</translation>
     </message>
     <message>
         <source>- %1 is not a namespace</source>
-        <translation>- %1 はネームスペースではありません</translation>
+        <translation>- %1 は名前空間ではありません</translation>
     </message>
     <message>
         <source>- nested namespaces not allowed</source>
-        <translation>- ネームスペースのネストは許可されていません</translation>
+        <translation>- 名前空間のネストは許可されていません</translation>
     </message>
     <message>
         <source>local directory</source>
@@ -1878,7 +1878,7 @@ to
     </message>
     <message>
         <source>ListElement: cannot contain nested elements</source>
-        <translation>ListElement: ネストしたエレメントは保持できません</translation>
+        <translation>ListElement: ネストした要素は保持できません</translation>
     </message>
     <message>
         <source>ListElement: cannot use reserved &quot;id&quot; property</source>
@@ -1998,19 +1998,19 @@ to
     </message>
     <message>
         <source>Invalid import qualifier ID</source>
-        <translation>import するネームスペースの ID が無効です</translation>
+        <translation>import する名前空間の ID が無効です</translation>
     </message>
     <message>
         <source>Reserved name &quot;Qt&quot; cannot be used as an qualifier</source>
-        <translation>予約語 &quot;Qt&quot; を import するネームスペースに使用することはできません</translation>
+        <translation>予約語 &quot;Qt&quot; を import する名前空間に使用することはできません</translation>
     </message>
     <message>
         <source>Script import qualifiers must be unique.</source>
-        <translation>スクリプトを import するネームスペースは一意である必要があります。</translation>
+        <translation>スクリプトを import する名前空間は一意である必要があります。</translation>
     </message>
     <message>
         <source>Script import requires a qualifier</source>
-        <translation>スクリプトを import する際にはネームスペースの指定が必要です</translation>
+        <translation>スクリプトを import する際には名前空間の指定が必要です</translation>
     </message>
     <message>
         <source>Library import requires a version</source>
@@ -2097,6 +2097,44 @@ to
     </message>
 </context>
 <context>
+    <name>QDeclarativeTypeData</name>
+    <message>
+        <source>Script %1 unavailable</source>
+        <translation type="obsolete">スクリプト %1 が利用できません</translation>
+    </message>
+    <message>
+        <source>Type %1 unavailable</source>
+        <translation type="obsolete">型 %1 が利用できません</translation>
+    </message>
+    <message>
+        <source>Namespace %1 cannot be used as a type</source>
+        <translation type="obsolete">名前空間 %1 を型として使用することはできません</translation>
+    </message>
+    <message>
+        <source>%1 %2</source>
+        <translation type="obsolete">%1 %2</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeTypeLoader</name>
+    <message>
+        <source>Script %1 unavailable</source>
+        <translation>スクリプト %1 が利用できません</translation>
+    </message>
+    <message>
+        <source>Type %1 unavailable</source>
+        <translation>型 %1 が利用できません</translation>
+    </message>
+    <message>
+        <source>Namespace %1 cannot be used as a type</source>
+        <translation>名前空間 %1 を型として使用することはできません</translation>
+    </message>
+    <message>
+        <source>%1 %2</source>
+        <translation>%1 %2</translation>
+    </message>
+</context>
+<context>
     <name>QDeclarativeVME</name>
     <message>
         <source>Unable to create object of type %1</source>
@@ -3316,7 +3354,7 @@ Do you want to delete it anyway?</source>
     <name>QLibrary</name>
     <message>
         <source>Could not mmap &apos;%1&apos;: %2</source>
-        <translation>&apos;%1&apos; をメモリにマッピングできませんでした: %2</translation>
+        <translation type="obsolete">&apos;%1&apos; をメモリにマッピングできませんでした: %2</translation>
     </message>
     <message>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
@@ -3324,7 +3362,7 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <source>Could not unmap &apos;%1&apos;: %2</source>
-        <translation>&apos;%1&apos; のマッピングを解除できませんでした: %2</translation>
+        <translation type="obsolete">&apos;%1&apos; のマッピングを解除できませんでした: %2</translation>
     </message>
     <message>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
@@ -3663,7 +3701,7 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt is a Nokia product. See &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; for more information.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Qt はクロスプラットフォームアプリケーション開発用の C++ ツールキットです。&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Qt ライセンスについての概要は &lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; をご覧ください。&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt は Nokia 社の製品です。詳しい情報は &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; をご覧ください。&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -5751,7 +5789,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Hot Links</source>
-        <translation type="unfinished"></translation>
+        <translation>人気のリンク</translation>
     </message>
     <message>
         <source>Adjust Brightness</source>
@@ -5771,15 +5809,15 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Back Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>戻る</translation>
     </message>
     <message>
         <source>Application Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Application Left</translation>
     </message>
     <message>
         <source>Application Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Application Right</translation>
     </message>
     <message>
         <source>Book</source>
@@ -5799,7 +5837,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Clear Grab</source>
-        <translation type="unfinished"></translation>
+        <translation>Clear Grab</translation>
     </message>
     <message>
         <source>Close</source>
@@ -5839,11 +5877,11 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Go</source>
-        <translation type="unfinished"></translation>
+        <translation>Go</translation>
     </message>
     <message>
         <source>iTouch</source>
-        <translation type="unfinished"></translation>
+        <translation>iTouch</translation>
     </message>
     <message>
         <source>Logoff</source>
@@ -5863,7 +5901,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Menu PB</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu PB</translation>
     </message>
     <message>
         <source>My Sites</source>
@@ -5899,15 +5937,15 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Rotate Windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Rotate Windows</translation>
     </message>
     <message>
         <source>Rotation PB</source>
-        <translation type="unfinished"></translation>
+        <translation>Rotation PB</translation>
     </message>
     <message>
         <source>Rotation KB</source>
-        <translation type="unfinished"></translation>
+        <translation>Rotation KB</translation>
     </message>
     <message>
         <source>Save</source>
@@ -6023,7 +6061,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Audio Cycle Track</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio Cycle Track</translation>
     </message>
     <message>
         <source>Time</source>
@@ -6130,7 +6168,7 @@ Please choose a different file name.</source>
     <message>
         <source>Toggle Call/Hangup</source>
         <extracomment>Button that will hang up if we&apos;re in call, or make a call if we&apos;re not.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>通話/終話の切替</translation>
     </message>
     <message>
         <source>Flip</source>
@@ -6138,7 +6176,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Voice Dial</source>
-        <extracomment>Button to trigger voice dialling</extracomment>
+        <extracomment>Button to trigger voice dialing</extracomment>
         <translation>ボイスダイアル</translation>
     </message>
     <message>
@@ -6238,43 +6276,43 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Hangul Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Start</translation>
     </message>
     <message>
         <source>Hangul End</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul End</translation>
     </message>
     <message>
         <source>Hangul Hanja</source>
-        <translation type="unfinished"></translation>
+        <translation>ハングル 漢字</translation>
     </message>
     <message>
         <source>Hangul Jamo</source>
-        <translation type="unfinished"></translation>
+        <translation>ハングル 字母</translation>
     </message>
     <message>
         <source>Hangul Romaja</source>
-        <translation type="unfinished"></translation>
+        <translation>ハングル ローマ字入力</translation>
     </message>
     <message>
         <source>Hangul Jeonja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Jeonja</translation>
     </message>
     <message>
         <source>Hangul Banja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Banja</translation>
     </message>
     <message>
         <source>Hangul PreHanja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul PreHanja</translation>
     </message>
     <message>
         <source>Hangul PostHanja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul PostHanja</translation>
     </message>
     <message>
         <source>Hangul Special</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Special</translation>
     </message>
     <message>
         <source>Ctrl</source>
@@ -6469,7 +6507,7 @@ Please choose a different file name.</source>
     <name>QSslSocket</name>
     <message>
         <source>Error creating SSL context (%1)</source>
-        <translation>SSL content の作成に失敗しました (%1)</translation>
+        <translation>SSL context の作成に失敗しました (%1)</translation>
     </message>
     <message>
         <source>Invalid or empty cipher list (%1)</source>
@@ -7223,12 +7261,12 @@ Please choose a different file name.</source>
     <message>
         <source>Seek quickly back</source>
         <comment>Media controller element</comment>
-        <translation type="unfinished"></translation>
+        <translation>少し戻る</translation>
     </message>
     <message>
         <source>Seek quickly forward</source>
         <comment>Media controller element</comment>
-        <translation type="unfinished"></translation>
+        <translation>少し進む</translation>
     </message>
     <message>
         <source>Indefinite time</source>
@@ -7794,7 +7832,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
-        <translation>このコンテキストでは、&apos;]]&gt;&apos; は許可されていません。</translation>
+        <translation>このコンテンツでは、&apos;]]&gt;&apos; は許可されていません。</translation>
     </message>
     <message>
         <source>Encountered incorrectly encoded content.</source>
@@ -7944,7 +7982,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Element %1 can&apos;t be serialized because it appears outside the document element.</source>
-        <translation>エレメント %1 はシリアライズできません。このドキュメントの範囲を越えるエレメントを含んでいます。</translation>
+        <translation>要素 %1 はシリアライズできません。このドキュメントの範囲を越える要素を含んでいます。</translation>
     </message>
     <message>
         <source>Attribute %1 can&apos;t be serialized because it appears at the top level.</source>
@@ -7952,7 +7990,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Year %1 is invalid because it begins with %2.</source>
-        <translation>%1 年はむこうです。%2 で始まっています。</translation>
+        <translation>%1 年は無効です。%2 で始まっています。</translation>
     </message>
     <message>
         <source>Day %1 is outside the range %2..%3.</source>
@@ -7992,7 +8030,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>%1 is not a valid value of type %2.</source>
-        <translation>%1 は、%2 の型に対して有効な値ではありません。</translation>
+        <translation>%1 は、型 %2 の値として無効です。</translation>
     </message>
     <message>
         <source>When casting to %1 from %2, the source value cannot be %3.</source>
@@ -8044,7 +8082,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>%1 is not valid as a value of type %2.</source>
-        <translation>型 %2 に対して、値 %1 は有効ではありません。</translation>
+        <translation>値 %1 は、型 %2 の値として無効です。</translation>
     </message>
     <message>
         <source>Ambiguous rule match.</source>
@@ -8084,7 +8122,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>In a namespace constructor, the value for a namespace cannot be an empty string.</source>
-        <translation>名前空間のスントラクトにおいて、空白の文字列を名前空間の値として使用することはできません。</translation>
+        <translation>名前空間のコンストラクタにおいて、空白の文字列を名前空間の値として使用することはできません。</translation>
     </message>
     <message>
         <source>The prefix must be a valid %1, which %2 is not.</source>
@@ -8136,11 +8174,11 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>No namespace binding exists for the prefix %1</source>
-        <translation>プレフィックス %1 にバインドされたネームスペースがありません</translation>
+        <translation>プレフィックス %1 にバインドされた名前空間がありません</translation>
     </message>
     <message>
         <source>No namespace binding exists for the prefix %1 in %2</source>
-        <translation>%2 におけるプレフィックス %1 にバインディングされたネームスペースが存在しません</translation>
+        <translation>%2 におけるプレフィックス %1 にバインディングされた名前空間が存在しません</translation>
     </message>
     <message>
         <source>%1 is an invalid %2</source>
@@ -8180,7 +8218,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>%1 is not a valid XML 1.0 character.</source>
-        <translation>%1 は XML 1.0 において有効な文字ではありません。</translation>
+        <translation>%1 は、XML 1.0 文字として無効です。</translation>
     </message>
     <message>
         <source>The root node of the second argument to function %1 must be a document node. %2 is not a document node.</source>
@@ -8224,7 +8262,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>%1 is an invalid regular expression pattern: %2</source>
-        <translation>%1 は有効な正規表現ではありません。: %2</translation>
+        <translation>%1 は有効な正規表現ではありません: %2</translation>
     </message>
     <message>
         <source>%1 is an invalid flag for regular expressions. Valid flags are:</source>
@@ -8276,15 +8314,15 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>W3C XML Schema identity constraint selector</source>
-        <translation type="unfinished"></translation>
+        <translation>W3C XML スキーマ ID制約 selector</translation>
     </message>
     <message>
         <source>W3C XML Schema identity constraint field</source>
-        <translation type="unfinished"></translation>
+        <translation>W3C XML スキーマ ID制約 field</translation>
     </message>
     <message>
         <source>A construct was encountered which is disallowed in the current language(%1).</source>
-        <translation type="unfinished"></translation>
+        <translation>現在の言語 (%1) では許可されていない構造が検出されました。</translation>
     </message>
     <message>
         <source>%1 is an unknown schema type.</source>
@@ -8488,11 +8526,11 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>An attribute with name %1 has already appeared on this element.</source>
-        <translation>属性名 &apos;%1&apos; は、すでにこのエレメントで使用されています。</translation>
+        <translation>属性名 &apos;%1&apos; は、すでにこの要素で使用されています。</translation>
     </message>
     <message>
         <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
-        <translation>直積的な指定のエレメントがwell formedではありません。&apos;%1&apos; が、&apos;%2&apos; で終わっています。</translation>
+        <translation>直積的な指定の要素がwell formedではありません。&apos;%1&apos; が、&apos;%2&apos; で終わっています。</translation>
     </message>
     <message>
         <source>The name %1 does not refer to any schema type.</source>
@@ -8520,7 +8558,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Element %1 is not allowed at this location.</source>
-        <translation>この場所にエレメント &apos;%1&apos; をおくことは許可されていません。</translation>
+        <translation>この場所に要素 %1 をおくことは許可されていません。</translation>
     </message>
     <message>
         <source>Text nodes are not allowed at this location.</source>
@@ -8552,31 +8590,31 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>If element %1 has no attribute %2, it cannot have attribute %3 or %4.</source>
-        <translation>エレメント &apos;%1&apos; が属性 &apos;%2&apos; を持たない場合は、属性 &apos;%3&apos; や &apos;%4&apos; を使用することはできません。</translation>
+        <translation>要素 &apos;%1&apos; が属性 &apos;%2&apos; を持たない場合は、属性 &apos;%3&apos; や &apos;%4&apos; を使用することはできません。</translation>
     </message>
     <message>
         <source>Element %1 must have at least one of the attributes %2 or %3.</source>
-        <translation>エレメント &apos;%1&apos; は、属性 &apos;%2&apos; か &apos;%3&apos; のいずれかを持たなければなりません。</translation>
+        <translation>要素 &apos;%1&apos; は、属性 &apos;%2&apos; か &apos;%3&apos; のいずれかを持たなければなりません。</translation>
     </message>
     <message>
         <source>At least one mode must be specified in the %1-attribute on element %2.</source>
-        <translation>エレメント &apos;%2&apos; において、&apos;%1&apos; 属性は少くとも一つのモードを指定しなければなりません。</translation>
+        <translation>要素 &apos;%2&apos; において、&apos;%1&apos; 属性は少くとも一つのモードを指定しなければなりません。</translation>
     </message>
     <message>
         <source>Element %1 must come last.</source>
-        <translation>エレメント %1 は最後になければなりません。</translation>
+        <translation>要素 %1 は最後になければなりません。</translation>
     </message>
     <message>
         <source>At least one %1-element must occur before %2.</source>
-        <translation>%2 の前に、少くとも一つは %1 エレメントが存在しなければなりません。</translation>
+        <translation>%2 の前に、少くとも一つは %1 要素が存在しなければなりません。</translation>
     </message>
     <message>
         <source>Only one %1-element can appear.</source>
-        <translation>%1 エレメントは一つのみ存在しなければなりません。</translation>
+        <translation>%1 要素は一つのみ存在しなければなりません。</translation>
     </message>
     <message>
         <source>At least one %1-element must occur inside %2.</source>
-        <translation>%2 の内側には、少くとも一つの &apos;%1&apos; エレメントが存在しなければなりません。</translation>
+        <translation>%2 の内側には、少くとも一つの &apos;%1&apos; 要素が存在しなければなりません。</translation>
     </message>
     <message>
         <source>When attribute %1 is present on %2, a sequence constructor cannot be used.</source>
@@ -8584,7 +8622,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Element %1 must have either a %2-attribute or a sequence constructor.</source>
-        <translation>エレメント %1 には、%2 属性またはsequence constructorがなければなりません。</translation>
+        <translation>要素 %1 には、%2 属性またはsequence constructorがなければなりません。</translation>
     </message>
     <message>
         <source>When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.</source>
@@ -8592,11 +8630,11 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Element %1 cannot have children.</source>
-        <translation>エレメント %1 は、子要素を持つことができません。</translation>
+        <translation>要素 %1 は、子要素を持つことができません。</translation>
     </message>
     <message>
         <source>Element %1 cannot have a sequence constructor.</source>
-        <translation>エレメント %1 は、sequence constructor を含むことができません。</translation>
+        <translation>要素 %1 は、sequence constructor を含むことができません。</translation>
     </message>
     <message>
         <source>The attribute %1 cannot appear on %2, when it is a child of %3.</source>
@@ -8612,11 +8650,11 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Top level stylesheet elements must be in a non-null namespace, which %1 isn&apos;t.</source>
-        <translation>トップレベルのスタイルシートのエレメントは、non-nullな名前空間を持っていなければなりません。しかし、%1 はそうではありません。</translation>
+        <translation>トップレベルのスタイルシートの要素は、non-nullな名前空間を持っていなければなりません。しかし、%1 はそうではありません。</translation>
     </message>
     <message>
         <source>The value for attribute %1 on element %2 must either be %3 or %4, not %5.</source>
-        <translation>エレメント %2 の属性 %1 の値は、%3 または %4 でなければなりません。%5 は異なります。</translation>
+        <translation>要素 %2 の属性 %1 の値は、%3 または %4 でなければなりません。%5 は異なります。</translation>
     </message>
     <message>
         <source>Attribute %1 cannot have the value %2.</source>
@@ -8624,1083 +8662,1083 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>The attribute %1 can only appear on the first %2 element.</source>
-        <translation>属性 %1 は、最初の %2 エレメントにのみ指定できます。</translation>
+        <translation>属性 %1 は、最初の %2 要素にのみ指定できます。</translation>
     </message>
     <message>
         <source>At least one %1 element must appear as child of %2.</source>
-        <translation>%2 の子要素としては、少くとも一つは %1 エレメントがなければなりません。</translation>
+        <translation>%2 の子要素としては、少くとも一つは %1 要素がなければなりません。</translation>
     </message>
     <message>
         <source>Empty particle cannot be derived from non-empty particle.</source>
-        <translation>空ではない particle から空の particle を得ることはできません。</translation>
+        <translation>空ではないパーティクルから空のパーティクルを派生させることはできません。</translation>
     </message>
     <message>
         <source>Derived particle is missing element %1.</source>
-        <translation>取得した particle に要素 %1 がありません。</translation>
+        <translation>派生パーティクル に要素 %1 がありません。</translation>
     </message>
     <message>
         <source>Derived element %1 is missing value constraint as defined in base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生要素 %1 は基底パーティクルで値制約が定義されていません。</translation>
     </message>
     <message>
         <source>Derived element %1 has weaker value constraint than base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生要素 %1 は基底パーティクルよりも弱い値制約を持っています。</translation>
     </message>
     <message>
         <source>Fixed value constraint of element %1 differs from value constraint in base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 の固定値制約は基底パーティクルの値制約と異なっています。</translation>
     </message>
     <message>
         <source>Derived element %1 cannot be nillable as base element is not nillable.</source>
-        <translation type="unfinished"></translation>
+        <translation>基底要素が null を許可していない為、派生要素 %1 に null を許可させる事はできません。</translation>
     </message>
     <message>
         <source>Block constraints of derived element %1 must not be more weaker than in the base element.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生要素 %1 の Block 制約は、基底要素よりも弱くできません。</translation>
     </message>
     <message>
         <source>Simple type of derived element %1 cannot be validly derived from base element.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生要素 %1 の単純型は、基底要素から適切に派生できません。</translation>
     </message>
     <message>
         <source>Complex type of derived element %1 cannot be validly derived from base element.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生要素 %1 の複合型は、基底要素から適切に派生できません。</translation>
     </message>
     <message>
         <source>Element %1 is missing in derived particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生パーティクルに要素 %1 がありません。</translation>
     </message>
     <message>
         <source>Element %1 does not match namespace constraint of wildcard in base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は基底パーティクルのワイルドカードの名前空間制約にマッチしません。</translation>
     </message>
     <message>
         <source>Wildcard in derived particle is not a valid subset of wildcard in base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生パーティクルにあるワイルドカードは、基底パーティクルのワイルドカードのサブセットとして無効です。</translation>
     </message>
     <message>
         <source>processContent of wildcard in derived particle is weaker than wildcard in base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生パーティクルのワイルドカードの processContent は基底パーティクルのワイルドカードよりも弱いです。</translation>
     </message>
     <message>
         <source>Derived particle allows content that is not allowed in the base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生パーティクルはコンテンツを許可していますが、基底パーティクルでは許可していません。</translation>
     </message>
     <message>
         <source>%1 has inheritance loop in its base type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は、基底型 %2 で継承ループしています。</translation>
     </message>
     <message>
         <source>Circular inheritance of base type %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>基底型 %1 を循環継承しています。</translation>
     </message>
     <message>
         <source>Circular inheritance of union %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>union %1 を循環継承しています。</translation>
     </message>
     <message>
         <source>%1 is not allowed to derive from %2 by restriction as the latter defines it as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は最終的に定義される制約により %2 を派生する事は許可されていません。</translation>
     </message>
     <message>
         <source>%1 is not allowed to derive from %2 by extension as the latter defines it as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は最終的に定義される拡張により %2 を派生する事は許可されていません。</translation>
     </message>
     <message>
         <source>Base type of simple type %1 cannot be complex type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 の基底型は複合型 %2 にはできません。</translation>
     </message>
     <message>
         <source>Simple type %1 cannot have direct base type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 は基底型 %2 を直接持つ事はできません。</translation>
     </message>
     <message>
         <source>Simple type %1 is not allowed to have base type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 は基底型 %2 を持つ事は許可されていません。</translation>
     </message>
     <message>
         <source>Simple type %1 can only have simple atomic type as base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 は基底型として単純なアトミック型のみ持つ事ができます。</translation>
     </message>
     <message>
         <source>Simple type %1 cannot derive from %2 as the latter defines restriction as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 は最終的に定義される制約により %2 を派生できません。</translation>
     </message>
     <message>
         <source>Variety of item type of %1 must be either atomic or union.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 の各アイテム型は atomic か union である必要があります。</translation>
     </message>
     <message>
         <source>Variety of member types of %1 must be atomic.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 の各メンバーの型は atomic である必要があります。</translation>
     </message>
     <message>
         <source>%1 is not allowed to derive from %2 by list as the latter defines it as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は最終的に定義されるリストにより %2 を派生する事は許可されていません。</translation>
     </message>
     <message>
         <source>Simple type %1 is only allowed to have %2 facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 は %2 ファセットのみ持つ事ができます。</translation>
     </message>
     <message>
         <source>Base type of simple type %1 must have variety of type list.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 の基底型は各型のリストを持っていなければなりません。</translation>
     </message>
     <message>
         <source>Base type of simple type %1 has defined derivation by restriction as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 の基底型は最終的に制約により派生として定義されています。</translation>
     </message>
     <message>
         <source>Item type of base type does not match item type of %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>基底型のアイテム型が %1 のアイテム型にマッチしていません。</translation>
     </message>
     <message>
         <source>Simple type %1 contains not allowed facet type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 がファセット型 %2 を含む事は許可されていません。</translation>
     </message>
     <message>
         <source>%1 is not allowed to derive from %2 by union as the latter defines it as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は最終的に定義される union により %2 を派生する事は許可されていません。</translation>
     </message>
     <message>
         <source>%1 is not allowed to have any facets.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 はどんなファセットも持つ事を許可されていません。</translation>
     </message>
     <message>
         <source>Base type %1 of simple type %2 must have variety of union.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %2 の基底型 %1 は各型の uinon を持っていなければなりません。</translation>
     </message>
     <message>
         <source>Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %2 の基底型 %1 は %3 属性内に制約を持つ事を許可されていません。</translation>
     </message>
     <message>
         <source>Member type %1 cannot be derived from member type %2 of %3&apos;s base type %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>メンバ型 %1 は %3 の基底型 %4 のメンバ型 %2 から派生する事はできません。</translation>
     </message>
     <message>
         <source>Derivation method of %1 must be extension because the base type %2 is a simple type.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 の派生メソッドは基底型 %2 が単純型の為、拡張でなければなりません。</translation>
     </message>
     <message>
         <source>Complex type %1 has duplicated element %2 in its content model.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合形 %1 は自身のコンテンツ モデル内で要素 %2 を重複させています。</translation>
     </message>
     <message>
         <source>Complex type %1 has non-deterministic content.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 は非決定性コンテンツを所有しています。</translation>
     </message>
     <message>
         <source>Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 の属性は、基底型 %2 の属性の拡張として無効です: %3。</translation>
     </message>
     <message>
         <source>Content model of complex type %1 is not a valid extension of content model of %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 のコンテンツ モデルは、%2 のコンテンツ モデルの拡張として無効です。</translation>
     </message>
     <message>
         <source>Complex type %1 must have simple content.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 は単純コンテンツを持たなければなりません。</translation>
     </message>
     <message>
         <source>Complex type %1 must have the same simple type as its base class %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 は基底クラス %2 のような単純型を持たなければなりません。</translation>
     </message>
     <message>
         <source>Complex type %1 cannot be derived from base type %2%3.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 は基底型 %2 から派生する事はできません %3。</translation>
     </message>
     <message>
         <source>Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 の属性は、基底型 %2 の属性の制約として無効です: %3。</translation>
     </message>
     <message>
         <source>Complex type %1 with simple content cannot be derived from complex base type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純コンテンツの複合型 %1 は複合基底型 %2 を派生する事はできません。</translation>
     </message>
     <message>
         <source>Item type of simple type %1 cannot be a complex type.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 のアイテム型を複合型にする事はできません。</translation>
     </message>
     <message>
         <source>Member type of simple type %1 cannot be a complex type.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 のメンバー型を複合型にする事はできません。</translation>
     </message>
     <message>
         <source>%1 is not allowed to have a member type with the same name as itself.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は自身と同名のメンバー型を所有する事を許可していません。</translation>
     </message>
     <message>
         <source>%1 facet collides with %2 facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットと %2 ファセットが衝突しています。</translation>
     </message>
     <message>
         <source>%1 facet must have the same value as %2 facet of base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは基底型の %2 ファセットと同値を所有しなければなりません。</translation>
     </message>
     <message>
         <source>%1 facet must be equal or greater than %2 facet of base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは基底型の %2 ファセットと同じかそれ以上でなければなりません。</translation>
     </message>
     <message>
         <source>%1 facet must be less than or equal to %2 facet of base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは基底型の %2 ファセット以下でなければなりません。</translation>
     </message>
     <message>
         <source>%1 facet contains invalid regular expression</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは無効な正規表現を含んでいます</translation>
     </message>
     <message>
         <source>Unknown notation %1 used in %2 facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>未知の表記法 %1 が %2 ファセットで使われています。</translation>
     </message>
     <message>
         <source>%1 facet contains invalid value %2: %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは無効な値 %2 を含んでいます: %3。</translation>
     </message>
     <message>
         <source>%1 facet cannot be %2 or %3 if %4 facet of base type is %5.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは、%4 ファセットの基底型が %5 の場合に %2 や %3 にする事はできません。</translation>
     </message>
     <message>
         <source>%1 facet cannot be %2 if %3 facet of base type is %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは、%3 ファセットの基底型が %4 の場合に %2 にする事はできません。</translation>
     </message>
     <message>
         <source>%1 facet must be less than or equal to %2 facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは %2 ファセット以下でなければなりません。</translation>
     </message>
     <message>
         <source>%1 facet must be less than %2 facet of base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは基底型の %2 ファセット以下でなければなりません。</translation>
     </message>
     <message>
         <source>%1 facet and %2 facet cannot appear together.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットと %2 ファセットを同時に現す事はできません。</translation>
     </message>
     <message>
         <source>%1 facet must be greater than %2 facet of base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは基底型の %2 ファセット以上でなければなりません。</translation>
     </message>
     <message>
         <source>%1 facet must be less than %2 facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは %2 ファセット以下でなければなりません。</translation>
     </message>
     <message>
         <source>%1 facet must be greater than or equal to %2 facet of base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ファセットは基底型の %2 ファセット以上でなければなりません。</translation>
     </message>
     <message>
         <source>Simple type contains not allowed facet %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型がファセット %1 を含む事は許可されていません。</translation>
     </message>
     <message>
         <source>%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.</source>
-        <translation type="unfinished"></translation>
+        <translation>list に派生される場合、%1, %2, %3, %4, %5, %6 ファセットは許可されていません。</translation>
     </message>
     <message>
         <source>Only %1 and %2 facets are allowed when derived by union.</source>
-        <translation type="unfinished"></translation>
+        <translation>union に派生される場合、%1 と %2 ファセットだけが許可されます。</translation>
     </message>
     <message>
         <source>%1 contains %2 facet with invalid data: %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は無効なデータを含んだ %2 ファセットが含まれています: %3。</translation>
     </message>
     <message>
         <source>Attribute group %1 contains attribute %2 twice.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性グループ %1 は属性 %2 を2重に含んでいます。</translation>
     </message>
     <message>
         <source>Attribute group %1 contains two different attributes that both have types derived from %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性グループ %1 はどちらも %2 から派生した型を持つ2つの異なる属性を含んでいます。</translation>
     </message>
     <message>
         <source>Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性グループ %1 は %3 を継承した型の値制約を持つ属性 %2 を含んでいます。</translation>
     </message>
     <message>
         <source>Complex type %1 contains attribute %2 twice.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 は属性 %2 を2回含んでいます。</translation>
     </message>
     <message>
         <source>Complex type %1 contains two different attributes that both have types derived from %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 はどちらも %2 から派生した型を持つ2つの異なる属性を含んでいます。</translation>
     </message>
     <message>
         <source>Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 は %3 を継承した型の値制約を持つ属性 %2 を含んでいます。</translation>
     </message>
     <message>
         <source>Element %1 is not allowed to have a value constraint if its base type is complex.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は自身の基底型が複合型の場合に値制約を持つ事を許可されていません。</translation>
     </message>
     <message>
         <source>Element %1 is not allowed to have a value constraint if its type is derived from %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は、自身が %2 を派生している場合に値制約を持つ事を許可されていません。</translation>
     </message>
     <message>
         <source>Value constraint of element %1 is not of elements type: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 の値制約は要素型のものではありません: %2。</translation>
     </message>
     <message>
         <source>Element %1 is not allowed to have substitution group affiliation as it is no global element.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 はグローバル要素ではない代替グループ関係を持つ事を許可されていません。</translation>
     </message>
     <message>
         <source>Type of element %1 cannot be derived from type of substitution group affiliation.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 の型は代替グループ関係の型を派生する事はできません。</translation>
     </message>
     <message>
         <source>Value constraint of attribute %1 is not of attributes type: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性 %1 の値制約は属性型のものではありません: %2。</translation>
     </message>
     <message>
         <source>Attribute %1 has value constraint but has type derived from %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性 %1 は %2 から派生した型を持つ値制約を持っています。</translation>
     </message>
     <message>
         <source>%1 attribute in derived complex type must be %2 like in base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生複合型の %1 属性は基底型のように %2 でなければなりません。</translation>
     </message>
     <message>
         <source>Attribute %1 in derived complex type must have %2 value constraint like in base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生複合型の属性 %1 は基底型のように %2 値制約を持たなければなりません。</translation>
     </message>
     <message>
         <source>Attribute %1 in derived complex type must have the same %2 value constraint like in base type.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生複合型の属性 %1 は、基底型と同様に %2 値制約を持たなければなりません。</translation>
     </message>
     <message>
         <source>Attribute %1 in derived complex type must have %2 value constraint.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生複合型の属性 %1 は %2 値制約を持たなければなりません。</translation>
     </message>
     <message>
         <source>processContent of base wildcard must be weaker than derived wildcard.</source>
-        <translation type="unfinished"></translation>
+        <translation>基底ワイルドカードの processContent は派生ワイルドカードよりも弱くなければなりません。</translation>
     </message>
     <message>
         <source>Element %1 exists twice with different types.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 が異なる型で2つ存在しています。</translation>
     </message>
     <message>
         <source>Particle contains non-deterministic wildcards.</source>
-        <translation type="unfinished"></translation>
+        <translation>パーティクルは非決定性ワイルドカードを含んでいます。</translation>
     </message>
     <message>
         <source>Base attribute %1 is required but derived attribute is not.</source>
-        <translation type="unfinished"></translation>
+        <translation>基底属性 %1 は必須ですが派生属性はそうなっていません。</translation>
     </message>
     <message>
         <source>Type of derived attribute %1 cannot be validly derived from type of base attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生属性 %1 の型は基底属性の型を有効に派生する事はできません。</translation>
     </message>
     <message>
         <source>Value constraint of derived attribute %1 does not match value constraint of base attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生属性 %1 の値制約は基底属性の値制約にマッチしません。</translation>
     </message>
     <message>
         <source>Derived attribute %1 does not exist in the base definition.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生属性 %1 は基底定義の中に存在しません。</translation>
     </message>
     <message>
         <source>Derived attribute %1 does not match the wildcard in the base definition.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生属性 %1 は基底定義のワイルドカードにマッチしません。</translation>
     </message>
     <message>
         <source>Base attribute %1 is required but missing in derived definition.</source>
-        <translation type="unfinished"></translation>
+        <translation>基底属性 %1 は必須ですが派生定義内に見つかりません。</translation>
     </message>
     <message>
         <source>Derived definition contains an %1 element that does not exists in the base definition</source>
-        <translation type="unfinished"></translation>
+        <translation>派生定義は %1 要素を含んでいますが基底定義内で存在していません</translation>
     </message>
     <message>
         <source>Derived wildcard is not a subset of the base wildcard.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生ワイルドカードは基底ワイルドカードのサブセットではありません。</translation>
     </message>
     <message>
         <source>%1 of derived wildcard is not a valid restriction of %2 of base wildcard</source>
-        <translation type="unfinished"></translation>
+        <translation>派生ワイルドカードの %1 は、基底ワイルドカードの %2 の制約として無効です</translation>
     </message>
     <message>
         <source>Attribute %1 from base type is missing in derived type.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生型で基底型の属性 %1 が見つかりません。</translation>
     </message>
     <message>
         <source>Type of derived attribute %1 differs from type of base attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>派生属性 %1 の型が基底属性の型と異なっています。</translation>
     </message>
     <message>
         <source>Base definition contains an %1 element that is missing in the derived definition</source>
-        <translation type="unfinished"></translation>
+        <translation>基底定義は %1 要素を含んでいますが派生定義内で見つかりません</translation>
     </message>
     <message>
         <source>Can not process unknown element %1, expected elements are: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>未知の要素 %1 を処理できません、期待する要素は以下のものです: %2。</translation>
     </message>
     <message>
         <source>Element %1 is not allowed in this scope, possible elements are: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 はこのスコープ内で許可されていません、使用可能な要素は次のものです: %2。</translation>
     </message>
     <message>
         <source>Child element is missing in that scope, possible child elements are: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>子要素がそのスコープ内で見つかりません、使用可能な子要素は次のものです: %1。</translation>
     </message>
     <message>
         <source>Document is not a XML schema.</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントは XML スキーマではありません。</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性は不正なコンテンツを含んでいます: {%3} は型 %4 の値ではありません。</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element contains invalid content: {%3}.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性は不正なコンテンツを含んでいます: {%3}。</translation>
     </message>
     <message>
         <source>Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.</source>
-        <translation type="unfinished"></translation>
+        <translation>インクルードしているスキーマの対象名前空間 %1 はインクルードしようとしているスキーマで定義されている対象名前空間 %2 と異なっています。</translation>
     </message>
     <message>
         <source>Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema.</source>
-        <translation type="unfinished"></translation>
+        <translation>インポートしているスキーマの対象名前空間 %1 はインポートしようとしているスキーマで定義されている対象名前空間 %2 と異なっています。</translation>
     </message>
     <message>
         <source>%1 element is not allowed to have the same %2 attribute value as the target namespace %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素は対象名前空間 %3 として %2 属性値を持つ事を許可されていません。</translation>
     </message>
     <message>
         <source>%1 element without %2 attribute is not allowed inside schema without target namespace.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 属性なし %1 要素は対象名前空間なしのスキーマ内にある事を許可されていません。</translation>
     </message>
     <message>
         <source>%1 element is not allowed inside %2 element if %3 attribute is present.</source>
-        <translation type="unfinished"></translation>
+        <translation>%3 属性が存在している場合、%2 要素内で %1 要素は許可されていません。</translation>
     </message>
     <message>
         <source>%1 element has neither %2 attribute nor %3 child element.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素は %2 属性も %3 子要素のどちらも持っていません。</translation>
     </message>
     <message>
         <source>%1 element with %2 child element must not have a %3 attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 子要素付き %1 要素は %3 属性を持ってはいけません。</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element must be %3 or %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性は %3 か %4 でなければなりません。</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element must have a value of %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性の値は %3 でなければなりません。</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element must have a value of %3 or %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性の値は %3 か %4 でなければなりません。</translation>
     </message>
     <message>
         <source>%1 element must not have %2 and %3 attribute together.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素は %2 と %3 属性を同時に持っていてはいけません。</translation>
     </message>
     <message>
         <source>Content of %1 attribute of %2 element must not be from namespace %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性のコンテンツは名前空間 %3 のものであってはいけません。</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element must not be %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性は %3 であってはいけません。</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element must have the value %3 because the %4 attribute is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性は %4 属性がセットされているので値 %3 を持たなければなりません。</translation>
     </message>
     <message>
         <source>Specifying use=&apos;prohibited&apos; inside an attribute group has no effect.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性グループ内で定義されている use = &apos;prohibited&apos; は効果がありません。</translation>
     </message>
     <message>
         <source>%1 element must have either %2 or %3 attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素は %2 か %3 属性のどちらかを持たなければなりません。</translation>
     </message>
     <message>
         <source>%1 element must have either %2 attribute or %3 or %4 as child element.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素は %2 属性や子要素として %3 や %4 のどちらも持っていてはいけません。</translation>
     </message>
     <message>
         <source>%1 element requires either %2 or %3 attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素は %2 か %3 属性を必要とします。</translation>
     </message>
     <message>
         <source>Text or entity references not allowed inside %1 element</source>
-        <translation type="unfinished"></translation>
+        <translation>テキストまたはエンティティ参照は %1 要素内で許可されていません</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element must contain %3, %4 or a list of URIs.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性は %3、%4 または URI のリストを含んでいなければなりません。</translation>
     </message>
     <message>
         <source>%1 element is not allowed in this context.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素はこのコンテキストで許可されていません。</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element has larger value than %3 attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性は %3 属性よりも大きな値になっています。</translation>
     </message>
     <message>
         <source>Prefix of qualified name %1 is not defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>修飾名 %1 のプレフィックスが定義されていません。</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element must either contain %3 or the other values.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の %1 属性は %3 や他の値を含んではいけません。</translation>
     </message>
     <message>
         <source>Component with ID %1 has been defined previously.</source>
-        <translation type="unfinished"></translation>
+        <translation>ID %1 のコンポーネントは以前に定義されています。</translation>
     </message>
     <message>
         <source>Element %1 already defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 はすでに定義されています。</translation>
     </message>
     <message>
         <source>Attribute %1 already defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性 %1 はすでに定義されています。</translation>
     </message>
     <message>
         <source>Type %1 already defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>型 %1 はすでに定義されています。</translation>
     </message>
     <message>
         <source>Attribute group %1 already defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性グループ %1 はすでに定義されています。</translation>
     </message>
     <message>
         <source>Element group %1 already defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素グループ %1 はすでに定義されています。</translation>
     </message>
     <message>
         <source>Notation %1 already defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>表記法 %1 はすでに定義されています。</translation>
     </message>
     <message>
         <source>Identity constraint %1 already defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>ID制約 %1 はすでに定義されています。</translation>
     </message>
     <message>
         <source>Duplicated facets in simple type %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>単純型 %1 内でファセットが重複しています。</translation>
     </message>
     <message>
         <source>%1 references unknown %2 or %3 element %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は未知の %2 か %3 要素 %4 を参照しています。</translation>
     </message>
     <message>
         <source>%1 references identity constraint %2 that is no %3 or %4 element.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は %3 でも %4 要素でもないID制約 %2 を参照しています。</translation>
     </message>
     <message>
         <source>%1 has a different number of fields from the identity constraint %2 that it references.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 のフィールド数が、自身が参照しているID制約 %2 のフィールド数と異なっています。</translation>
     </message>
     <message>
         <source>Base type %1 of %2 element cannot be resolved.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の基底型 %1 を解決できませんでした。</translation>
     </message>
     <message>
         <source>Item type %1 of %2 element cannot be resolved.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素のアイテム型 %1 を解決できませんでした。</translation>
     </message>
     <message>
         <source>Member type %1 of %2 element cannot be resolved.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素のメンバー型 %1 を解決できませんでした。</translation>
     </message>
     <message>
         <source>Type %1 of %2 element cannot be resolved.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の型 %1 を解決できませんでした。</translation>
     </message>
     <message>
         <source>Base type %1 of complex type cannot be resolved.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型の基底型 %1 を解決できませんでした。</translation>
     </message>
     <message>
         <source>%1 cannot have complex base type that has a %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は %2 を持った複合基底型を持つ事はできません。</translation>
     </message>
     <message>
         <source>Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 のコンテンツモデルは %2 要素を含んでいますが非 empty 型を派生した拡張にする事はできません。</translation>
     </message>
     <message>
         <source>Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 は、%3 要素をコンテンツモデルに含んでいる %2 の拡張にする事はできません。</translation>
     </message>
     <message>
         <source>Type of %1 element must be a simple type, %2 is not.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素の型は %2 ではなく単純型にしなくてはいけません。</translation>
     </message>
     <message>
         <source>Substitution group %1 of %2 element cannot be resolved.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の代替グループ %1 を解決できませんでした。</translation>
     </message>
     <message>
         <source>Substitution group %1 has circular definition.</source>
-        <translation type="unfinished"></translation>
+        <translation>代替グループ %1 が循環参照しています。</translation>
     </message>
     <message>
         <source>Duplicated element names %1 in %2 element.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素内で要素名 %1 が重複しています。</translation>
     </message>
     <message>
         <source>Reference %1 of %2 element cannot be resolved.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 要素の参照 %1 を解決できませんでした。</translation>
     </message>
     <message>
         <source>Circular group reference for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>グループ参照 %1 が循環しています。</translation>
     </message>
     <message>
         <source>%1 element is not allowed in this scope</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素はこのスコープ内で許可されていません</translation>
     </message>
     <message>
         <source>%1 element cannot have %2 attribute with value other than %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素は %3 以外の値の %2 属性を持つ事はできません。</translation>
     </message>
     <message>
         <source>%1 element cannot have %2 attribute with value other than %3 or %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素は %3 や %4 以外の値の %2 属性を持つ事はできません。</translation>
     </message>
     <message>
         <source>%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>参照 %3 の %1 や %2 属性は属性宣言 %4 にマッチしません。</translation>
     </message>
     <message>
         <source>Attribute group %1 has circular reference.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性グループ %1 が循環参照しています。</translation>
     </message>
     <message>
         <source>%1 attribute in %2 must have %3 use like in base type %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 の属性 %1 は基底型 %4 のように %3 を所有しなくてはいけません。</translation>
     </message>
     <message>
         <source>Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 の属性ワイルドカードは、基底型 %2 の属性ワイルドカードの制約として無効です。</translation>
     </message>
     <message>
         <source>%1 has attribute wildcard but its base type %2 has not.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 はワイルドカードを使用した属性を所有していますが基底型 %2 は所有していません。</translation>
     </message>
     <message>
         <source>Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible.</source>
-        <translation type="unfinished"></translation>
+        <translation>型 %1 の属性ワイルドカードの union と基底型 %2 の属性ワイルドカードは表現可能ではありません。</translation>
     </message>
     <message>
         <source>Enumeration facet contains invalid content: {%1} is not a value of type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>列挙型ファセットが不正なコンテンツを含んでいます: {%1} は、型 %2 の値ではありません。</translation>
     </message>
     <message>
         <source>Namespace prefix of qualified name %1 is not defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>修飾名 %1 の名前空間プレフィックスが定義されていません。</translation>
     </message>
     <message>
         <source>%1 element %2 is not a valid restriction of the %3 element it redefines: %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 要素 %2 は %3 要素が再定義している制約として無効です: %4。</translation>
     </message>
     <message>
         <source>%1 is not valid according to %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 によると %1 は妥当ではありません。</translation>
     </message>
     <message>
         <source>String content does not match the length facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>string コンテンツが length ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>String content does not match the minLength facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>string コンテンツが minLength ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>String content does not match the maxLength facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>string コンテンツが maxLength ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>String content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>string コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>String content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>string コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>Signed integer content does not match the maxInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>signed integer コンテンツが maxInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Signed integer content does not match the maxExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>signed integer コンテンツが maxExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Signed integer content does not match the minInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>signed integer コンテンツが minInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Signed integer content does not match the minExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>signed integer コンテンツが minExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Signed integer content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>signed integer コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>Signed integer content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>signed integer コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Signed integer content does not match in the totalDigits facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>signed integer コンテンツが totalDigits ファセットで指定される値の範囲にマッチしません。</translation>
     </message>
     <message>
         <source>Unsigned integer content does not match the maxInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>unsigned integer コンテンツが maxInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Unsigned integer content does not match the maxExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>unsigned integer コンテンツが maxExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Unsigned integer content does not match the minInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>unsigned integer コンテンツが minInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Unsigned integer content does not match the minExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>unsigned integer コンテンツが minExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Unsigned integer content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>unsigned integer コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>Unsigned integer content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>unsigned integer コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Unsigned integer content does not match in the totalDigits facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>unsigned integer コンテンツが totalDigits ファセットで指定される値の範囲にマッチしません。</translation>
     </message>
     <message>
         <source>Double content does not match the maxInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>double コンテンツが maxInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Double content does not match the maxExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>double コンテンツが maxExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Double content does not match the minInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>double コンテンツが minInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Double content does not match the minExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>double コンテンツが minExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Double content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>double コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>Double content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>double コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Decimal content does not match in the fractionDigits facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>decimal コンテンツが fractionDigits ファセットで指定される値の範囲にマッチしません。</translation>
     </message>
     <message>
         <source>Decimal content does not match in the totalDigits facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>decimal コンテンツが totalDigits ファセットで指定される値の範囲にマッチしません。</translation>
     </message>
     <message>
         <source>Date time content does not match the maxInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>date time コンテンツが maxInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Date time content does not match the maxExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>date time コンテンツが maxExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Date time content does not match the minInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>date time コンテンツが minInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Date time content does not match the minExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>date time コンテンツが minExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Date time content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>date time コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>Date time content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>date time コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Duration content does not match the maxInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>duration コンテンツが maxInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Duration content does not match the maxExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>duration コンテンツが maxExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Duration content does not match the minInclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>duration コンテンツが minInclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Duration content does not match the minExclusive facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>duration コンテンツが minExclusive ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Duration content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>duration コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>Duration content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>duration コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Boolean content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>boolean コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Binary content does not match the length facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>binary コンテンツが length ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Binary content does not match the minLength facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>binary コンテンツが minLength ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Binary content does not match the maxLength facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>binary コンテンツが maxLength ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Binary content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>binary コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>Invalid QName content: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>無効な QName コンテンツ: %1。</translation>
     </message>
     <message>
         <source>QName content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>QName コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>QName content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>QName コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Notation content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>notation コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>List content does not match length facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>list コンテンツが length ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>List content does not match minLength facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>list コンテンツが minLength ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>List content does not match maxLength facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>list コンテンツが maxLength ファセットにマッチしません。</translation>
     </message>
     <message>
         <source>List content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>list コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>List content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>list コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Union content is not listed in the enumeration facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>union コンテンツが列挙型ファセット内の一覧にありません。</translation>
     </message>
     <message>
         <source>Union content does not match pattern facet.</source>
-        <translation type="unfinished"></translation>
+        <translation>union コンテンツがパターンファセットにマッチしません。</translation>
     </message>
     <message>
         <source>Data of type %1 are not allowed to be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>型 %1 のデータは空にする事を許容されていません。</translation>
     </message>
     <message>
         <source>Element %1 is missing child element.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 に子要素がありません。</translation>
     </message>
     <message>
         <source>There is one IDREF value with no corresponding ID: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>ID %1 に対応するIDREFがありません。</translation>
     </message>
     <message>
         <source>Loaded schema file is invalid.</source>
-        <translation type="unfinished"></translation>
+        <translation>読み込まれているスキーマファイルは無効です。</translation>
     </message>
     <message>
         <source>%1 contains invalid data.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は無効なデータを含んでいます。</translation>
     </message>
     <message>
         <source>xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.</source>
-        <translation type="unfinished"></translation>
+        <translation>xsi:schemaLocation 名前空間 %1 はインスタンスドキュメントの前に既に現れています。</translation>
     </message>
     <message>
         <source>xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>先頭の namespace ではない要素または属性の後に xsi:noNamespaceSchemaLocation を使用できません。</translation>
     </message>
     <message>
         <source>No schema defined for validation.</source>
-        <translation type="unfinished"></translation>
+        <translation>妥当性検証の為のスキーマが定義されていません。</translation>
     </message>
     <message>
         <source>No definition for element %1 available.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は使用できるように定義されていません。</translation>
     </message>
     <message>
         <source>Specified type %1 is not known to the schema.</source>
-        <translation type="unfinished"></translation>
+        <translation>指定された型 %1 はスキーマで未知です。</translation>
     </message>
     <message>
         <source>Element %1 is not defined in this scope.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 がこのスコープ内で定義されていません。</translation>
     </message>
     <message>
         <source>Declaration for element %1 does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 の宣言が存在しません。</translation>
     </message>
     <message>
         <source>Element %1 contains invalid content.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は不正な内容を含んでいます。</translation>
     </message>
     <message>
         <source>Element %1 is declared as abstract.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は抽象型として宣言されています。</translation>
     </message>
     <message>
         <source>Element %1 is not nillable.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は null を許可していません。</translation>
     </message>
     <message>
         <source>Attribute %1 contains invalid data: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>属性 %1 は不正なデータを含んでいます: %2</translation>
     </message>
     <message>
         <source>Element contains content although it is nillable.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素は null が許容されていますが内容を含んでいます。</translation>
     </message>
     <message>
         <source>Fixed value constraint not allowed if element is nillable.</source>
-        <translation type="unfinished"></translation>
+        <translation>null が許容されている要素への固定値制約は許容されていません。</translation>
     </message>
     <message>
         <source>Specified type %1 is not validly substitutable with element type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>指定された型 %1 は有効に置換できる要素型 %2 ではありません。</translation>
     </message>
     <message>
         <source>Complex type %1 is not allowed to be abstract.</source>
-        <translation type="unfinished"></translation>
+        <translation>複合型 %1 を抽象化する事は許可されていません。</translation>
     </message>
     <message>
         <source>Element %1 contains not allowed attributes.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は属性を含む事を許可されていません。</translation>
     </message>
     <message>
         <source>Element %1 contains not allowed child element.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は子要素を含む事を許可されていません。</translation>
     </message>
     <message>
         <source>Content of element %1 does not match its type definition: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 の内容が自身の型の定義とマッチしていません: %2。</translation>
     </message>
     <message>
         <source>Content of element %1 does not match defined value constraint.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 の内容が定義されている値制約にマッチしていません。</translation>
     </message>
     <message>
         <source>Element %1 contains not allowed child content.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は子の内容を含む事を許可されていません。</translation>
     </message>
     <message>
         <source>Element %1 contains not allowed text content.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 はテキストを含む事を許可されていません。</translation>
     </message>
     <message>
         <source>Element %1 cannot contain other elements, as it has a fixed content.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は固定値を持った他の要素を含む事はできません。</translation>
     </message>
     <message>
         <source>Element %1 is missing required attribute %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 に要求された属性 %2 がありません。</translation>
     </message>
     <message>
         <source>Attribute %1 does not match the attribute wildcard.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性 %1 は属性ワイルドカードにマッチしていません。</translation>
     </message>
     <message>
         <source>Declaration for attribute %1 does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性 %1 の宣言が存在していません。</translation>
     </message>
     <message>
         <source>Element %1 contains two attributes of type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 が型 %2 の属性を2個含んでいます。</translation>
     </message>
     <message>
         <source>Attribute %1 contains invalid content.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性 %1 は不正な内容を含んでいます。</translation>
     </message>
     <message>
         <source>Element %1 contains unknown attribute %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>要素 %1 は未知の属性 %2 を含んでいます。</translation>
     </message>
     <message>
         <source>Content of attribute %1 does not match its type definition: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性 %1 の内容が自身の型の定義にマッチしていません: %2。</translation>
     </message>
     <message>
         <source>Content of attribute %1 does not match defined value constraint.</source>
-        <translation type="unfinished"></translation>
+        <translation>属性 %1 の内容が値制約の定義にマッチしていません。</translation>
     </message>
     <message>
         <source>Non-unique value found for constraint %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>制約 %1 に一意ではない値が見つかりました。</translation>
     </message>
     <message>
         <source>Key constraint %1 contains absent fields.</source>
-        <translation type="unfinished"></translation>
+        <translation>キー制約 %1 は欠落したフィールドを含んでいます。</translation>
     </message>
     <message>
         <source>Key constraint %1 contains references nillable element %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>キー制約 %1 は null を許容する要素 %2 の参照を含んでいます。</translation>
     </message>
     <message>
         <source>No referenced value found for key reference %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>キー参照 %1 によって参照される値が見つかりません。</translation>
     </message>
     <message>
         <source>More than one value found for field %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>フィールド %1 に2個以上の値があります。</translation>
     </message>
     <message>
         <source>Field %1 has no simple type.</source>
-        <translation type="unfinished"></translation>
+        <translation>フィールド %1 が単純型を持っていません。</translation>
     </message>
     <message>
         <source>ID value &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
+        <translation>ID 値 &apos;%1&apos; が一意ではありません。</translation>
     </message>
     <message>
         <source>&apos;%1&apos; attribute contains invalid QName content: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; 属性は不正な QName の内容を含んでいます: %2。</translation>
     </message>
     <message>
         <source>empty</source>
diff --git a/translations/qtconfig_ja.ts b/translations/qtconfig_ja.ts
index e92a7d1..2c3c248 100644
--- a/translations/qtconfig_ja.ts
+++ b/translations/qtconfig_ja.ts
@@ -4,151 +4,114 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../tools/qtconfig/mainwindow.cpp" line="+204"/>
         <source>Desktop Settings (Default)</source>
         <translation>デスクトップの設定(デフォルト)</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Choose style and palette based on your desktop settings.</source>
         <translation>デスクトップの設定に応じてスタイルとパレットを選択します。</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>On The Spot</source>
         <translation>On The Spot</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <location line="+1"/>
-        <location line="+40"/>
-        <location line="+1"/>
         <source>Auto (default)</source>
         <translation>自動(デフォルト)</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>Choose audio output automatically.</source>
         <translation>オーディオ出力を自動的に選択します。</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+1"/>
         <source>aRts</source>
         <translation>aRts</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Experimental aRts support for GStreamer.</source>
         <translation>Gstreamer での aRts のサポート(Experimental)。</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Phonon GStreamer backend not available.</source>
         <translation>Phonon の GStreamer バックエンドが見つかりません。</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Choose render method automatically</source>
         <translation>描画メソッドを自動的に選択します</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1"/>
         <source>X11</source>
         <translation>X11</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Use X11 Overlays</source>
         <translation>X11 のオーバーレイを使用</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>OpenGL</source>
         <translation>OpenGL</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Use OpenGL if available</source>
         <translation>OpenGL が使用可能な場合は使用</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1"/>
         <source>Software</source>
         <translation>ソフトウェア</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Use simple software rendering</source>
         <translation>ソフトウェアでの描画を使用</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>No changes to be saved.</source>
         <translation>内容が変更されていません。</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Saving changes...</source>
         <translation>保存中…</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>Over The Spot</source>
         <translation>Over The Spot</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Off The Spot</source>
         <translation>Off The Spot</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Root</source>
         <translation>Root</translation>
     </message>
     <message>
-        <location line="+466"/>
         <source>Select a Directory</source>
         <translation>ディレクトリの選択</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;Version %2&lt;br/&gt;&lt;br/&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source>
         <translation>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;バージョン %2&lt;br/&gt;&lt;br/&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
-        <location line="+8"/>
         <source>Qt Configuration</source>
         <translation>Qt 設定ツール</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Save Changes</source>
         <translation>変更の保存</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save changes to settings?</source>
         <translation>変更内容を設定に保存しますか？</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Yes</source>
         <translation>はい(&amp;Y)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;No</source>
         <translation>いいえ(&amp;N)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Cancel</source>
         <translation>キャンセル(&amp;C)</translation>
     </message>
@@ -156,363 +119,278 @@
 <context>
     <name>MainWindowBase</name>
     <message>
-        <location filename="../tools/qtconfig/mainwindowbase.ui" line="+54"/>
         <source>Qt Configuration</source>
         <translation>Qt 設定ツール</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Appearance</source>
         <translation>外観</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>GUI Style</source>
         <translation>GUI スタイル</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Select GUI &amp;Style:</source>
         <translation>GUI スタイルの選択(&amp;S):</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Preview</source>
         <translation>プレビュー</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Select &amp;Palette:</source>
         <translation>パレットの選択(&amp;P):</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Active Palette</source>
         <translation>アクティブなパレット</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Inactive Palette</source>
         <translation>アクティブではないパレット</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Disabled Palette</source>
         <translation>無効時のパレット</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Build Palette</source>
         <translation>パレットの設定</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>&amp;3-D Effects:</source>
         <translation>&amp;3D エフェクト:</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Window Back&amp;ground:</source>
         <translation>ウィンドウのバックグラウンド(&amp;G):</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>&amp;Tune Palette...</source>
         <translation>パレットを調整(&amp;T)...</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Please use the KDE Control Center to set the palette.</source>
         <translation>KDE のコントロールセンターでパレットの設定をしてください。</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Fonts</source>
         <translation>フォント</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Default Font</source>
         <translation>デフォルトのフォント</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>&amp;Style:</source>
         <translation>スタイル(&amp;S):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>&amp;Point Size:</source>
         <translation>ポイントサイズ(&amp;P):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>F&amp;amily:</source>
         <translation>ファミリー(&amp;F):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Sample Text</source>
         <translation>テキストのサンプル</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Font Substitution</source>
         <translation>フォントの置換</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>S&amp;elect or Enter a Family:</source>
         <translation>ファミリーを選択するか入力してください(&amp;E):</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Current Substitutions:</source>
         <translation>現在の置換定義:</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+501"/>
         <source>Up</source>
         <translation>上へ</translation>
     </message>
     <message>
-        <location line="-494"/>
-        <location line="+508"/>
         <source>Down</source>
         <translation>下へ</translation>
     </message>
     <message>
-        <location line="-501"/>
-        <location line="+494"/>
         <source>Remove</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location line="-464"/>
         <source>Select s&amp;ubstitute Family:</source>
         <translation>置換するファミリーの選択(&amp;U):</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+487"/>
         <source>Add</source>
         <translation>追加</translation>
     </message>
     <message>
-        <location line="-474"/>
         <source>Interface</source>
         <translation>インターフェース</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Feel Settings</source>
         <translation>一般的な設定</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+26"/>
         <source> ms</source>
         <translation>ミリ秒</translation>
     </message>
     <message>
-        <location line="-13"/>
         <source>&amp;Double Click Interval:</source>
         <translation>ダブルクリックの間隔(&amp;D):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>No blinking</source>
         <translation>点滅しない</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>&amp;Cursor Flash Time:</source>
         <translation>カーソルの点滅の間隔(&amp;C):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source> lines</source>
         <translation>行</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Wheel &amp;Scroll Lines:</source>
         <translation>マウスホイールでのスクロール行数(&amp;S):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Resolve symlinks in URLs</source>
         <translation>URL のシンボリックリンクの解決</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>GUI Effects</source>
         <translation>GUI のエフェクト</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>&amp;Enable</source>
         <translation>有効(&amp;E)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+E</source>
         <translation>Alt+E</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>&amp;Menu Effect:</source>
         <translation>メニューのエフェクト(&amp;E):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>C&amp;omboBox Effect:</source>
         <translation>コンボボックスのエフェクト(&amp;O):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>&amp;ToolTip Effect:</source>
         <translation>ツールチップのエフェクト(&amp;T):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Tool&amp;Box Effect:</source>
         <translation>ツールボックスのエフェクト(&amp;B):</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+19"/>
-        <location line="+14"/>
-        <location line="+19"/>
         <source>Disable</source>
         <translation>無効</translation>
     </message>
     <message>
-        <location line="-47"/>
-        <location line="+19"/>
-        <location line="+14"/>
-        <location line="+19"/>
         <source>Animate</source>
         <translation>アニメーション</translation>
     </message>
     <message>
-        <location line="-47"/>
-        <location line="+33"/>
         <source>Fade</source>
         <translation>フェード</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Global Strut</source>
         <translation>Global Strut</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Minimum &amp;Width:</source>
         <translation>幅の最小値(&amp;W):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Minimum Hei&amp;ght:</source>
         <translation>高さの最小値(&amp;G):</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+10"/>
         <source> pixels</source>
         <translation>ピクセル</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Enhanced support for languages written right-to-left</source>
         <translation>右から左に書かれる言語のサポートの強化</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>XIM Input Style:</source>
         <translation>XIM のインプットスタイル:</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>On The Spot</source>
         <translation>On The Spot</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Over The Spot</source>
         <translation>Over The Spot</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Off The Spot</source>
         <translation>Off The Spot</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Root</source>
         <translation>Root</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Default Input Method:</source>
         <translation>デフォルトのインプットメソッド:</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Printer</source>
         <translation>プリンタ</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Enable Font embedding</source>
         <translation>フォントを埋め込む</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Font Paths</source>
         <translation>フォントのパス</translation>
     </message>
     <message>
-        <location line="+77"/>
         <source>Browse...</source>
         <translation>ブラウズ...</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Press the &lt;b&gt;Browse&lt;/b&gt; button or enter a directory and press Enter to add them to the list.</source>
         <translation>&lt;b&gt;ブラウズ&lt;/b&gt;ボタンを押すかディレクトリを入力し、エンターキーか追加ボタンでリストに追加してください。</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Phonon</source>
         <translation>Phonon</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>About Phonon</source>
         <translation>Phonon について</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+44"/>
         <source>Current Version:</source>
         <translation>現在のバージョン:</translation>
     </message>
     <message>
-        <location line="-37"/>
-        <location line="+44"/>
         <source>Not available</source>
         <translation>使用不可能</translation>
     </message>
     <message>
-        <location line="-37"/>
-        <location line="+44"/>
         <source>Website:</source>
         <translation>ウェブサイト:</translation>
     </message>
     <message>
-        <location line="-37"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -525,12 +403,10 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>About GStreamer</source>
         <translation>GStreamer について</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -543,22 +419,18 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>GStreamer backend settings</source>
         <translation>GStreamer のバックエンドの設定</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Preferred audio sink:</source>
         <translation>優先するオーディオシンク:</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Preferred render method:</source>
         <translation>優先する描画方法:</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -571,57 +443,46 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;注: これらの設定の変更によりアプリケーションが正常に起動しなくなる場合があります。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>&amp;File</source>
         <translation>ファイル(&amp;F)</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>&amp;Save</source>
         <translation>保存(&amp;S)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>E&amp;xit</source>
         <translation>終了(&amp;X)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Exit</source>
         <translation>終了</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;About</source>
         <translation>Qt 設定ツールについて(&amp;A)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>About</source>
         <translation>Qt 設定ツールについて</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>About &amp;Qt</source>
         <translation>&amp;Qt について</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>About Qt</source>
         <translation>Qt について</translation>
     </message>
@@ -629,208 +490,166 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PaletteEditorAdvancedBase</name>
     <message>
-        <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="+61"/>
         <source>Tune Palette</source>
         <translation>パレットの調整</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the palette of the current widget or form.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</source>
         <translation>&lt;b&gt;パレットの編集&lt;/b&gt;&lt;p&gt;現在のウィジェットやフォームのパレットを変更してください。&lt;/p&gt;&lt;p&gt;自動生成されたパレットを使用するか、それぞれのグループ／役割に対して色を選択してください。&lt;/p&gt;&lt;p&gt;パレットの内容のプレビューセクションにある様々なウィジェットのレイアウトで確認できます。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Select &amp;Palette:</source>
         <translation>パレットの選択(&amp;P):</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Active Palette</source>
         <translation>アクティブなパレット</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Inactive Palette</source>
         <translation>アクティブではないパレット</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Disabled Palette</source>
         <translation>無効時のパレット</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Auto</source>
         <translation>自動</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Build inactive palette from active</source>
         <translation>アクティブなパレットからアクティブではないパレットを構築</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Build disabled palette from active</source>
         <translation>アクティブなパレットから無効時のパレットを構築</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Central color &amp;roles</source>
         <translation>中央部の色の役割(&amp;R)</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Choose central color role</source>
         <translation>中央部の色の役割を選択してください</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available central roles are: &lt;ul&gt; &lt;li&gt;Window - general background color.&lt;/li&gt; &lt;li&gt;WindowText - general foreground color. &lt;/li&gt; &lt;li&gt;Base - used as background color for e.g. text entry widgets, usually white or another light color. &lt;/li&gt; &lt;li&gt;Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. &lt;/li&gt; &lt;li&gt;Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. &lt;/li&gt; &lt;li&gt;ButtonText - a foreground color used with the Button color. &lt;/li&gt; &lt;li&gt;Highlight - a color to indicate a selected or highlighted item. &lt;/li&gt; &lt;li&gt;HighlightedText - a text color that contrasts to Highlight. &lt;/li&gt; &lt;li&gt;BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</source>
         <translation>&lt;b&gt;色の役割の選択。&lt;/b&gt;&lt;p&gt;選択可能な中央部の役割: &lt;ul&gt; &lt;li&gt;ウィンドウ - 一般的な背景色。&lt;/li&gt; &lt;li&gt;ウィンドウテキスト - 一般的な前景色。 &lt;/li&gt; &lt;li&gt;ベース - テキスト入力ウィジェット等の背景色。通常は白などの明るい色。 &lt;/li&gt; &lt;li&gt;テキスト - ベースと共に用いられる前景色。通常はウィンドウテキストと同じだが、ウィンドウとベースに対してよりよいコントラストが必要な場合に使用される。 &lt;/li&gt; &lt;li&gt;ボタン - 一般的なボタンの背景色。Macintosh スタイルのようにウィンドウと異なる背景色を使用する場合に使用される。 &lt;/li&gt; &lt;li&gt;ボタンテキスト - ボタンと共に用いられる前景色 &lt;/li&gt; &lt;li&gt;ハイライト - アイテムが選択されていたり、ハイライトされていることを示すために使用される色。 &lt;/li&gt; &lt;li&gt;ハイライトのテキスト - ハイライト時のテキストの色。 &lt;/li&gt; &lt;li&gt;明るいテキスト - 黒などの背景色に対して使用されるテキストの色。ウィンドウテキストの反対の色。 &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Window</source>
         <translation>ウィンドウ</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>WindowText</source>
         <translation>ウィンドウテキスト</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Button</source>
         <translation>ボタン</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Base</source>
         <translation>ベース</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Text</source>
         <translation>テキスト</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>BrightText</source>
         <translation>明るいテキスト</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>ButtonText</source>
         <translation>ボタンテキスト</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Highlight</source>
         <translation>ハイライト</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>HighlightedText</source>
         <translation>ハイライトのテキスト</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>&amp;Select Color:</source>
         <translation>色の選択(&amp;S):</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+171"/>
         <source>Choose a color</source>
         <translation>色を選択してください</translation>
     </message>
     <message>
-        <location line="-168"/>
         <source>Choose a color for the selected central color role.</source>
         <translation>選択された中央部の色の役割に使用する色を選択してください。</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>3-D shadow &amp;effects</source>
         <translation>3Dの影の効果(&amp;E)</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Build &amp;from button color</source>
         <translation>ボタンの色から構築する(&amp;F)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Generate shadings</source>
         <translation>影を生成する</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Check to let 3D-effect colors be calculated from button-color.</source>
         <translation>3D効果の色をボタンの色から計算するにはチェックしてください。</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Choose 3D-effect color role</source>
         <translation>3D効果の色の役割の選択</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available effect roles are: &lt;ul&gt; &lt;li&gt;Light - lighter than Button color. &lt;/li&gt; &lt;li&gt;Midlight - between Button and Light. &lt;/li&gt; &lt;li&gt;Mid - between Button and Dark. &lt;/li&gt; &lt;li&gt;Dark - darker than Button. &lt;/li&gt; &lt;li&gt;Shadow - a very dark color. &lt;/li&gt; &lt;/ul&gt;</source>
         <translation>&lt;b&gt;色の役割の選択。&lt;/b&gt;&lt;p&gt;選択可能な中央部の役割: &lt;ul&gt; &lt;li&gt;ライト - ボタンの色より明るい。 &lt;/li&gt; &lt;li&gt;ミッドライト - ボタンとライトの間。 &lt;/li&gt; &lt;li&gt;ミッド - ボタンとダークの間。 &lt;/li&gt; &lt;li&gt;ダーク - ボタンより暗い。 &lt;/li&gt; &lt;li&gt;シャドウ - とても暗い色。 &lt;/li&gt; &lt;/ul&gt;</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Light</source>
         <translation>ライト</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Midlight</source>
         <translation>ミッドライト</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Mid</source>
         <translation>ミッド</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Dark</source>
         <translation>ダーク</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Shadow</source>
         <translation>シャドウ</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Select Co&amp;lor:</source>
         <translation>色の選択(&amp;L):</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Choose a color for the selected effect color role.</source>
         <translation>選択の効果の色の役割に使用する色を選択してください。</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Close dialog and apply all changes.</source>
         <translation>全ての変更を適用してダイアログを閉じる。</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Close dialog and discard all changes.</source>
         <translation>全ての変更を破棄してダイアログを閉じる。</translation>
     </message>
@@ -838,7 +657,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PreviewFrame</name>
     <message>
-        <location filename="../tools/qtconfig/previewframe.cpp" line="+81"/>
         <source>Desktop settings will only take effect after an application restart.</source>
         <translation>デスクトップの設定はアプリケーションの再起動後に反映されます。</translation>
     </message>
@@ -846,62 +664,50 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PreviewWidgetBase</name>
     <message>
-        <location filename="../tools/qtconfig/previewwidgetbase.ui" line="+66"/>
         <source>Preview Window</source>
         <translation>プレビューウィンドウ</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>ButtonGroup</source>
         <translation>ボタングループ</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>RadioButton1</source>
         <translation>ラジオボタン1</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>RadioButton2</source>
         <translation>ラジオボタン2</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>RadioButton3</source>
         <translation>ラジオボタン3</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>ButtonGroup2</source>
         <translation>ボタングループ2</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>CheckBox1</source>
         <translation>チェックボックス1</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>CheckBox2</source>
         <translation>チェックボックス2</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>LineEdit</source>
         <translation>ラインエディタ</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>ComboBox</source>
         <translation>コンボボックス</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>PushButton</source>
         <translation>プッシュボタン</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>&lt;p&gt;
 &lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;
 &lt;/p&gt;
diff --git a/translations/qvfb_ja.ts b/translations/qvfb_ja.ts
index cdf95c1..5dcfbc4 100644
--- a/translations/qvfb_ja.ts
+++ b/translations/qvfb_ja.ts
@@ -4,71 +4,54 @@
 <context>
     <name>AnimationSaveWidget</name>
     <message>
-        <location filename="../tools/qvfb/qvfb.cpp" line="+868"/>
-        <location line="+204"/>
         <source>Record</source>
         <translation>録画</translation>
     </message>
     <message>
-        <location line="-202"/>
         <source>Reset</source>
         <translation>リセット</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Save in MPEG format (requires netpbm package installed)</source>
         <translation>MPEG形式で保存(netpbmパッケージのインストールが必要)</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+206"/>
         <source>Click record to begin recording.</source>
         <translation>録画を開始するには「録画」をクリックしてください。</translation>
     </message>
     <message>
-        <location line="-115"/>
-        <location line="+147"/>
         <source>Finished saving.</source>
         <translation>保存が完了しました。</translation>
     </message>
     <message>
-        <location line="-63"/>
         <source>Paused. Click record to resume, or save if done.</source>
         <translation>一時停止中。「録画」をクリック再開するか、保存をしてください。</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Pause</source>
         <translation>一時停止</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Recording...</source>
         <translation>録画中...</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Saving... </source>
         <translation>保存中...</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+4"/>
         <source>Save animation...</source>
         <translation>動画を保存中...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Save canceled.</source>
         <translation>保存がキャンセルされました。</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Save failed!</source>
         <translation>保存に失敗しました！</translation>
     </message>
@@ -76,195 +59,154 @@
 <context>
     <name>Config</name>
     <message>
-        <location filename="../tools/qvfb/config.ui" line="+54"/>
         <source>Configure</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Size</source>
         <translation>サイズ</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>176x220 &quot;SmartPhone&quot;</source>
         <translation>176x220 &quot;スマートフォン&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>240x320 &quot;PDA&quot;</source>
         <translation>240x320 &quot;PDA&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>320x240 &quot;TV&quot; / &quot;QVGA&quot;</source>
         <translation>320x240 &quot;TV&quot; / &quot;QVGA&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>640x480 &quot;VGA&quot;</source>
         <translation>640x480 &quot;VGA&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>800x480</source>
         <translation>800x480</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>800x600</source>
         <translation>800x600</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>1024x768</source>
         <translation>1024x768</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Custom</source>
         <translation>それ以外</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Depth</source>
         <translation>色深度</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>1 bit monochrome</source>
         <translation>1 bit モノクロ</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>2 bit grayscale</source>
         <translation>2 bit グレイスケール</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>4 bit grayscale</source>
         <translation>4 bit グレイスケール</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>8 bit</source>
         <translation>8 bit</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>12 (16) bit</source>
         <translation>12(16) bit</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>15 bit</source>
         <translation>15 bit</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>16 bit</source>
         <translation>16 bit</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>18 bit</source>
         <translation>18 bit</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>24 bit</source>
         <translation>24 bit</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>32 bit</source>
         <translation>32 bit</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>32 bit ARGB</source>
         <translation>32 bit ARGB</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Swap red and blue channels</source>
         <translation>赤と青のチャンネルを入れ替える</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>BGR format</source>
         <translation>BGR フォーマット</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Skin</source>
         <translation>スキン</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>None</source>
         <translation>なし</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Emulate touch screen (no mouse move)</source>
         <translation>タッチスクリーンのエミュレート(マウスムーブが無効になります)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)</source>
         <translation>LCDスクリーンのエミュレート(3倍固定の拡大ズーム)</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>&lt;p&gt;Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth &lt;i&gt;above&lt;/i&gt;. You may freely modify the Gamma &lt;i&gt;below&lt;/i&gt;.</source>
         <translation>&lt;p&gt;&lt;i&gt;以上の&lt;/i&gt;サイズや色深度を変更した場合、ヴァーチャルフレームバッファ上で動作しているアプリケーションは終了します。&lt;i&gt;以下の&lt;/i&gt;ガンマ値の変更の場合はアプリケーションは終了しません。</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Gamma</source>
         <translation>ガンマ</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Blue</source>
         <translation>青</translation>
     </message>
     <message>
-        <location line="+489"/>
-        <location line="+496"/>
-        <location line="+14"/>
-        <location line="+496"/>
         <source>1.0</source>
         <translation>1.0</translation>
     </message>
     <message>
-        <location line="-999"/>
         <source>Green</source>
         <translation>緑</translation>
     </message>
     <message>
-        <location line="+496"/>
         <source>All</source>
         <translation>全て</translation>
     </message>
     <message>
-        <location line="+496"/>
         <source>Red</source>
         <translation>赤</translation>
     </message>
     <message>
-        <location line="+496"/>
         <source>Set all to 1.0</source>
         <translation>全て1.0にする</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>キャンセル(&amp;C)</translation>
     </message>
@@ -272,57 +214,46 @@
 <context>
     <name>DeviceSkin</name>
     <message>
-        <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="+79"/>
         <source>The image file &apos;%1&apos; could not be loaded.</source>
         <translation>画像ファイル &quot;%1&quot; を読み込めません。</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>The skin directory &apos;%1&apos; does not contain a configuration file.</source>
         <translation>スキンのディレクトリ &quot;%1&quot; に設定ファイルがありません。</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The skin configuration file &apos;%1&apos; could not be opened.</source>
         <translation>スキンの設定ファイル &quot;%1&quot; が開けません。</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The skin configuration file &apos;%1&apos; could not be read: %2</source>
         <translation>スキンの設定ファイル &quot;%1&quot; が読み込めません: %2</translation>
     </message>
     <message>
-        <location line="+70"/>
         <source>Syntax error: %1</source>
         <translation>シンタックスエラー: %1</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>The skin &quot;up&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>スキンの &quot;up&quot; の画像ファイル &quot;%1&quot; がありません。</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>The skin &quot;down&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>スキンの &quot;down&quot; の画像ファイル &quot;%1&quot; がありません。</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The skin &quot;closed&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>スキンの &quot;closed&quot; の画像ファイル &quot;%1&quot; がありません。</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>The skin cursor image file &apos;%1&apos; does not exist.</source>
         <translation>スキンのカーソルの画像ファイル &quot;%1&quot; がありません。</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Syntax error in area definition: %1</source>
         <translation>エリア定義のシンタックスエラー: %1</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Mismatch in number of areas, expected %1, got %2.</source>
         <translation>エリア数が正しくありません。%2 となってありますが %1 であるべきです。</translation>
     </message>
@@ -330,170 +261,134 @@
 <context>
     <name>QVFb</name>
     <message>
-        <location filename="../tools/qvfb/qvfb.cpp" line="-735"/>
         <source>&amp;Save image...</source>
         <translation>画像の保存(&amp;S)...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Animation...</source>
         <translation>動画の保存(&amp;A)...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Quit</source>
         <translation>終了(&amp;Q)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Show &amp;Cursor</source>
         <translation>カーソルの表示(&amp;C)</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Refresh Rate...</source>
         <translation>リフレッシュレート(&amp;R)...</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Zoom scale &amp;0.5</source>
         <translation>ズームスケール &amp;0.5</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Zoom scale &amp;1</source>
         <translation>ズームスケール &amp;1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom scale &amp;2</source>
         <translation>ズームスケール &amp;2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom scale &amp;3</source>
         <translation>ズームスケール &amp;3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom scale &amp;4</source>
         <translation>ズームスケール &amp;4</translation>
     </message>
     <message>
-        <location line="-30"/>
         <source>&amp;File</source>
         <translation>ファイル(&amp;F)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Configure...</source>
         <translation>設定の変更(&amp;C)...</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;View</source>
         <translation>表示(&amp;V)</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;No rotation</source>
         <translation>ローテーションなし(&amp;N)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;90° rotation</source>
         <translation>&amp;90° ローテーション</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>1&amp;80° rotation</source>
         <translation>1&amp;80° ローテーション</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>2&amp;70° rotation</source>
         <translation>2&amp;70° ローテーション</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Zoom scale 0.7&amp;5</source>
         <translation>ズームスケール 0.7&amp;5</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Zoom &amp;scale...</source>
         <translation>ズームスケール(&amp;S)...</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;About...</source>
         <translation>QVFB について(&amp;A)...</translation>
     </message>
     <message>
-        <location line="+87"/>
         <source>Save Main Screen image</source>
         <translation>メインスクリーンの画像の保存</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location line="+7"/>
         <source>snapshot.png</source>
         <translation>スナップショット.png</translation>
     </message>
     <message>
-        <location line="-7"/>
-        <location line="+7"/>
         <source>Portable Network Graphics (*.png)</source>
         <translation></translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Save Main Screen Image</source>
         <translation>メインスクリーンの画像の保存</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location line="+7"/>
         <source>Save failed. Check that you have permission to write to the target directory.</source>
         <translation>保存に失敗しました。保存先のディレクトリn書き込み権限があるかを確認してください。</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Save Second Screen image</source>
         <translation>サブスクリーンの画像の保存</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Save Second Screen Image</source>
         <translation>サブスクリーンの画像の保存</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>About QVFB</source>
         <translation>QVFB について</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&lt;h2&gt;The Qt for Embedded Linux Virtual X11 Framebuffer&lt;/h2&gt;&lt;p&gt;This application runs under Qt for X11, emulating a simple framebuffer, which the Qt for Embedded Linux server and clients can attach to just as if it was a hardware Linux framebuffer. &lt;p&gt;With the aid of this development tool, you can develop Qt for Embedded  Linux applications under X11 without having to switch to a virtual console. This means you can comfortably use your other development tools such as GUI profilers and debuggers.</source>
         <translation>&lt;h2&gt;The Qt for Embedded Linux Virtual X11 Framebuffer&lt;/h2&gt;&lt;p&gt;このアプリケーションは Qt for X11 上で動作し、Qt for Embedded Linux のサーバーとクライアントがハードウェアの Linux フレームバッファのように接続可能なシンプルなフレームバッファをエミュレートします。 &lt;p&gt;この開発ツールを使用すると Qt for Embedded Linux 向けのアプリケーションが X11 上でヴァーチャルコンソールへ切り替える事なく開発できるようになります。GUI のプロファイラやデバッガなどの他のツールを一緒に使用する時に便利でしょう。</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>Browse...</source>
         <translation>他のスキンを参照...</translation>
     </message>
     <message>
-        <location line="+143"/>
         <source>Load Custom Skin...</source>
         <translation>カスタムスキンを開く...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>All QVFB Skins (*.skin)</source>
         <translation>QVFB のスキン(*.skin)</translation>
     </message>
@@ -501,23 +396,18 @@
 <context>
     <name>QVFbRateDialog</name>
     <message>
-        <location filename="../tools/qvfb/qvfbratedlg.cpp" line="+58"/>
         <source>Target frame rate:</source>
         <translation>ターゲットのフレームレート:</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+17"/>
         <source>%1fps</source>
         <translation>%1fps</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
-- 
cgit v0.12


From a891f20bc370c24777e22be40499e695f97738f9 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Mon, 4 Oct 2010 17:16:36 +0200
Subject: Fix performance regression in QUuid::createUuid()

After commit 4363d4eebce4afd2ce3b3d6da205f8037357099a, createUuid()
would create a QFile, open it, read from it, and destroy it. This
resulted in a pretty serious performance regression (report says around
2000 times slower, I measured 3600 times slower on my machine).

This change creates one QFile per thread (since QFile is not thread
safe) and leaves the file open until the thread exits (at which point
QThreadStorage deletes the QFile).

This approach is around 600 times faster than the current code, which is
around 6 times slower than the original. Unfortunately, it is not
possible to restore the original performance without reintroducing the
problems that the commit mentioned above had fixed.

Benchmark is included.

Task-number: QTBUG-13877
Reviewed-by: thiago
Reviewed-by: mgoetz
---
 src/corelib/plugin/quuid.cpp                       | 67 ++++++++++++++--------
 tests/benchmarks/corelib/corelib.pro               |  3 +-
 tests/benchmarks/corelib/plugin/plugin.pro         |  2 +
 tests/benchmarks/corelib/plugin/quuid/quuid.pro    |  6 ++
 .../benchmarks/corelib/plugin/quuid/tst_quuid.cpp  | 66 +++++++++++++++++++++
 5 files changed, 118 insertions(+), 26 deletions(-)
 create mode 100644 tests/benchmarks/corelib/plugin/plugin.pro
 create mode 100644 tests/benchmarks/corelib/plugin/quuid/quuid.pro
 create mode 100644 tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp

diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index 6c1b6e7..983d249 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -582,48 +582,65 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #include <stdlib.h> // for RAND_MAX
 QT_END_INCLUDE_NAMESPACE
 
+#if !defined(QT_BOOTSTRAPPED) && defined(Q_OS_UNIX)
+Q_GLOBAL_STATIC(QThreadStorage<QFile *>, devUrandomStorage);
+#endif
+
 QUuid QUuid::createUuid()
 {
     QUuid result;
     uint *data = &(result.data1);
 
-#ifdef Q_OS_UNIX
-    QFile devUrandom;
-    devUrandom.setFileName(QLatin1String("/dev/urandom"));
-    if (devUrandom.open(QIODevice::ReadOnly)) {
-        qint64 numToRead = 4 * sizeof(uint);
-        devUrandom.read((char *) data, numToRead); // should read 128-bits of data
+#if defined(Q_OS_UNIX)
+    QFile *devUrandom;
+#  if !defined(QT_BOOTSTRAPPED)
+    devUrandom = devUrandomStorage()->localData();
+    if (!devUrandom) {
+        devUrandom = new QFile(QLatin1String("/dev/urandom"));
+        devUrandom->open(QIODevice::ReadOnly | QIODevice::Unbuffered);
+        devUrandomStorage()->setLocalData(devUrandom);
+    }
+# else
+    QFile file(QLatin1String("/dev/urandom"));
+    devUrandom = &file;
+    devUrandom->open(QIODevice::ReadOnly | QIODevice::Unbuffered);
+# endif
+    enum { AmountToRead = 4 * sizeof(uint) };
+    if (devUrandom->isOpen()
+        && devUrandom->read((char *) data, AmountToRead) == AmountToRead) {
+        // we got what we wanted, nothing more to do
+        ;
     } else
 #endif
     {
         static const int intbits = sizeof(int)*8;
         static int randbits = 0;
         if (!randbits) {
-        int r = 0;
+            int r = 0;
             int max = RAND_MAX;
             do { ++r; } while ((max=max>>1));
             randbits = r;
         }
 
-    // Seed the PRNG once per thread with a combination of current time, a
-    // stack address and a serial counter (since thread stack addresses are
-    // re-used).
+        // Seed the PRNG once per thread with a combination of current time, a
+        // stack address and a serial counter (since thread stack addresses are
+        // re-used).
 #ifndef QT_BOOTSTRAPPED
-    static QThreadStorage<int *> uuidseed;
-    if (!uuidseed.hasLocalData())
-    {
-        int *pseed = new int;
-        static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(2);
-        qsrand(*pseed = QDateTime::currentDateTime().toTime_t()
-                        + quintptr(&pseed)
-                        + serial.fetchAndAddRelaxed(1));
-        uuidseed.setLocalData(pseed);
-    }
+        static QThreadStorage<int *> uuidseed;
+        if (!uuidseed.hasLocalData())
+        {
+            int *pseed = new int;
+            static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(2);
+            qsrand(*pseed = QDateTime::currentDateTime().toTime_t()
+                   + quintptr(&pseed)
+                   + serial.fetchAndAddRelaxed(1));
+            uuidseed.setLocalData(pseed);
+        }
 #else
-    static bool seeded = false;
-    if (!seeded)
-        qsrand(QDateTime::currentDateTime().toTime_t()
-               + quintptr(&seeded));
+        static bool seeded = false;
+        if (!seeded)
+            qsrand(QDateTime::currentDateTime().toTime_t()
+                   + quintptr(&seeded));
 #endif
 
         int chunks = 16 / sizeof(uint);
@@ -631,7 +648,7 @@ QUuid QUuid::createUuid()
             uint randNumber = 0;
             for (int filled = 0; filled < intbits; filled += randbits)
                 randNumber |= qrand()<<filled;
-             *(data+chunks) = randNumber;
+            *(data+chunks) = randNumber;
         }
     }
 
diff --git a/tests/benchmarks/corelib/corelib.pro b/tests/benchmarks/corelib/corelib.pro
index 7669e0a..8a6941b 100644
--- a/tests/benchmarks/corelib/corelib.pro
+++ b/tests/benchmarks/corelib/corelib.pro
@@ -4,4 +4,5 @@ SUBDIRS = \
         kernel \
         thread \
         tools \
-	codecs
+	codecs \
+        plugin
diff --git a/tests/benchmarks/corelib/plugin/plugin.pro b/tests/benchmarks/corelib/plugin/plugin.pro
new file mode 100644
index 0000000..2afd7f3
--- /dev/null
+++ b/tests/benchmarks/corelib/plugin/plugin.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = quuid
diff --git a/tests/benchmarks/corelib/plugin/quuid/quuid.pro b/tests/benchmarks/corelib/plugin/quuid/quuid.pro
new file mode 100644
index 0000000..4e502fc
--- /dev/null
+++ b/tests/benchmarks/corelib/plugin/quuid/quuid.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_bench_quuid
+
+SOURCES += tst_quuid.cpp
+QT -= gui
diff --git a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp b/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp
new file mode 100644
index 0000000..e9d4b44
--- /dev/null
+++ b/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QUuid>
+#include <QtTest/QtTest>
+
+class tst_bench_QUuid : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_bench_QUuid()
+    { }
+
+private slots:
+    void createUuid();
+};
+
+void tst_bench_QUuid::createUuid()
+{
+    QBENCHMARK {
+        QUuid::createUuid();
+    }
+}
+
+QTEST_MAIN(tst_bench_QUuid);
+#include "tst_quuid.moc"
-- 
cgit v0.12


From 8ed3d9e33de7b4ee93b007ebde16ce42885ba95c Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Tue, 5 Oct 2010 12:06:10 +0200
Subject: QtScript/JavaScriptCore: Backport random number generator seeding fix

Backported changes:

    || <https://webkit.org/b/38719> || JavaScriptCore/wtf/RandomNumber.h should provide using WTF::* ||
    || <https://webkit.org/b/41868> || Don't seed the JS random number generator from time() ||

Task-number: QTBUG-13440
Reviewed-by: Simon Hausmann
---
 .../javascriptcore/JavaScriptCore/ChangeLog        | 31 ++++++++++++++++++++++
 .../JavaScriptCore/runtime/JSGlobalData.cpp        |  1 -
 .../JavaScriptCore/runtime/JSGlobalData.h          |  2 --
 .../JavaScriptCore/runtime/JSGlobalObject.h        |  4 +++
 .../JavaScriptCore/runtime/MathObject.cpp          |  2 +-
 .../JavaScriptCore/wtf/RandomNumber.h              |  3 +++
 src/3rdparty/javascriptcore/VERSION                |  4 +--
 7 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
index fbaf5d2..fd6c3f7 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-24  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoff Garen.
+
+        Don't seed the JS random number generator from time()
+        https://bugs.webkit.org/show_bug.cgi?id=41868
+        <rdar://problem/8171025>
+
+        Switch to using the secure random number generator to
+        seed the fast random generator, and make the generator
+        be per global object.
+
+        * runtime/JSGlobalData.cpp:
+        (JSC::JSGlobalData::JSGlobalData):
+        * runtime/JSGlobalData.h:
+        * runtime/JSGlobalObject.h:
+        (JSC::JSGlobalObject::JSGlobalObjectData::JSGlobalObjectData):
+        (JSC::JSGlobalObject::weakRandomNumber):
+        * runtime/MathObject.cpp:
+        (JSC::mathProtoFuncRandom):
+
 2010-06-18  Tucker Jay  <jay.tucker@nokia.com>
 
         Reviewed by NOBODY (OOPS!).
@@ -94,6 +115,16 @@
 
         * wtf/Platform.h:
 
+2010-05-06  Fumitoshi Ukai  <ukai@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        JavaScriptCore/wtf/RandomNumber.h should provide using WTF::*
+        https://bugs.webkit.org/show_bug.cgi?id=38719
+
+        * wtf/RandomNumber.h:
+          Add using directives.
+
 2010-04-28  Simon Hausmann  <simon.hausmann@nokia.com>, Kent Hansen <kent.hansen@nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.cpp
index 34b5f82..1c25c16 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.cpp
@@ -144,7 +144,6 @@ JSGlobalData::JSGlobalData(bool isShared)
     , firstStringifierToMark(0)
     , markStack(jsArrayVPtr)
     , cachedUTCOffset(NaN)
-    , weakRandom(static_cast<int>(currentTime()))
 #ifndef NDEBUG
     , mainThreadOnly(false)
 #endif
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.h
index 49a6c4c..dcd3289 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.h
@@ -184,8 +184,6 @@ namespace JSC {
         
         UString cachedDateString;
         double cachedDateStringValue;
-        
-        WeakRandom weakRandom;
 
 #ifndef NDEBUG
         bool mainThreadOnly;
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
index 340e04d..7c20272 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
@@ -31,6 +31,7 @@
 #include "StructureChain.h"
 #include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/RandomNumber.h>
 
 namespace JSC {
 
@@ -91,6 +92,7 @@ namespace JSC {
                 , datePrototype(0)
                 , regExpPrototype(0)
                 , methodCallDummy(0)
+                , weakRandom(static_cast<unsigned>(randomNumber() * (std::numeric_limits<unsigned>::max() + 1.0)))
             {
             }
             
@@ -154,6 +156,7 @@ namespace JSC {
             RefPtr<JSGlobalData> globalData;
 
             HashSet<GlobalCodeBlock*> codeBlocks;
+            WeakRandom weakRandom;
         };
 
     public:
@@ -271,6 +274,7 @@ namespace JSC {
             return Structure::create(prototype, TypeInfo(ObjectType, StructureFlags));
         }
 
+        double weakRandomNumber() { return d()->weakRandom.get(); }
     protected:
 
         static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesMarkChildren | OverridesGetPropertyNames | JSVariableObject::StructureFlags;
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp
index 8f22fba..807cfe7 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp
@@ -210,7 +210,7 @@ JSValue JSC_HOST_CALL mathProtoFuncPow(ExecState* exec, JSObject*, JSValue, cons
 
 JSValue JSC_HOST_CALL mathProtoFuncRandom(ExecState* exec, JSObject*, JSValue, const ArgList&)
 {
-    return jsDoubleNumber(exec, exec->globalData().weakRandom.get());
+    return jsDoubleNumber(exec, exec->lexicalGlobalObject()->weakRandomNumber());
 }
 
 JSValue JSC_HOST_CALL mathProtoFuncRound(ExecState* exec, JSObject*, JSValue, const ArgList& args)
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/RandomNumber.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/RandomNumber.h
index fe1687c..e54e9ae 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/RandomNumber.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/RandomNumber.h
@@ -39,4 +39,7 @@ namespace WTF {
 
 }
 
+using WTF::randomNumber;
+using WTF::weakRandomNumber;
+
 #endif
diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION
index 6f5fb7c..9991ac0 100644
--- a/src/3rdparty/javascriptcore/VERSION
+++ b/src/3rdparty/javascriptcore/VERSION
@@ -4,8 +4,8 @@ This is a snapshot of JavaScriptCore from
 
 The commit imported was from the
 
-        javascriptcore-snapshot-28062010 branch/tag
+        javascriptcore-snapshot-05102010 branch/tag
 
 and has the sha1 checksum
 
-        0fccd26d3624e80cf68873701ef70ad72ca66bec
+        82ead85cfea5859044eeb25b33314dcc0fa5eea1
-- 
cgit v0.12


From cace0a51e21ff8275b887025b562fc79bec9f32f Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Tue, 5 Oct 2010 11:28:35 -0500
Subject: Revert "QWorkspace: fix hardcoded min size overwriting the real min
 size"

This reverts commit b3a46493a1a74bd7918bd68638c28cf6e84eb57f.
---
 src/gui/widgets/qworkspace.cpp           | 15 ++++++---------
 tests/auto/qworkspace/tst_qworkspace.cpp | 10 ----------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp
index 3a9b30c..7180c4d 100644
--- a/src/gui/widgets/qworkspace.cpp
+++ b/src/gui/widgets/qworkspace.cpp
@@ -2551,6 +2551,7 @@ QWorkspaceChild::QWorkspaceChild(QWidget* window, QWorkspace *parent, Qt::Window
                  this, SLOT(titleBarDoubleClicked()));
     }
 
+    setMinimumSize(128, 0);
     int fw =  style()->pixelMetric(QStyle::PM_MdiSubWindowFrameWidth, 0, this);
     setContentsMargins(fw, fw, fw, fw);
 
@@ -2701,15 +2702,11 @@ QSize QWorkspaceChild::sizeHint() const
 
 QSize QWorkspaceChild::minimumSizeHint() const
 {
-    QSize s;
-    if (!childWidget) {
-        s = QWidget::minimumSizeHint();
-    } else {
-        s = childWidget->minimumSize();
-        if (s.isEmpty())
-            s = childWidget->minimumSizeHint();
-    }
-    s = s.expandedTo(QSize(128, 0));
+    if (!childWidget)
+        return QWidget::minimumSizeHint() + baseSize();
+    QSize s = childWidget->minimumSize();
+    if (s.isEmpty())
+        s = childWidget->minimumSizeHint();
     return s + baseSize();
 }
 
diff --git a/tests/auto/qworkspace/tst_qworkspace.cpp b/tests/auto/qworkspace/tst_qworkspace.cpp
index 9039eb3..4cf76b5 100644
--- a/tests/auto/qworkspace/tst_qworkspace.cpp
+++ b/tests/auto/qworkspace/tst_qworkspace.cpp
@@ -44,7 +44,6 @@
 #include <qapplication.h>
 #include <qmainwindow.h>
 #include <qmenubar.h>
-#include <qlayout.h>
 #include <qworkspace.h>
 #if defined(QT3_SUPPORT)
 #include <q3popupmenu.h>
@@ -592,25 +591,16 @@ void tst_QWorkspace::childSize()
 
     MyChild *child = new MyChild(&ws);
     child->show();
-    ws.addWindow(child);
     QCOMPARE(child->size(), child->sizeHint());
     delete child;
 
     child = new MyChild(&ws);
     child->setFixedSize(200, 200);
     child->show();
-    ws.addWindow(child);
     QCOMPARE(child->size(), child->minimumSize());
-    QCOMPARE(child->parentWidget()->metaObject()->className(), "QWorkspaceChild");
-    QVERIFY(child->parentWidget()->width() >= 200);
-    // check that the minimum size is respected, using closestAcceptableSize
-    // like QSizeGrip does.
-    const QSize newSize = QLayout::closestAcceptableSize(child->parentWidget(), QSize(100, 100));
-    QVERIFY(newSize.width() >= 200);
     delete child;
 
     child = new MyChild(&ws);
-    ws.addWindow(child);
     child->resize(150, 150);
     child->show();
     QCOMPARE(child->size(), QSize(150,150));
-- 
cgit v0.12


From 07256884f745e93d98687b213d037baf4be538a1 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 5 Oct 2010 17:20:31 +0200
Subject: make custom command handling in vc(x)proj files sane

instead of glueing the commands with "&&" and having a monster hack
(\r\h) for the case where they cannot be and-ed, glue them with newlines
and error checks. this ensures that we a) never have excessively long
lines, b) don't need the monster hack and c) commands always have proper
error checks, just like in makefiles.

Reviewed-by: mariusSO
---
 qmake/generators/win32/msbuild_objectmodel.cpp | 44 ++++++++---------------
 qmake/generators/win32/msbuild_objectmodel.h   |  2 +-
 qmake/generators/win32/msvc_objectmodel.cpp    | 49 +++++++++++---------------
 qmake/generators/win32/msvc_objectmodel.h      |  3 +-
 qmake/generators/win32/msvc_vcproj.cpp         | 26 ++++----------
 qmake/generators/win32/msvc_vcproj.h           |  1 -
 qmake/generators/win32/msvc_vcxproj.cpp        | 14 ++++----
 7 files changed, 50 insertions(+), 89 deletions(-)

diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 2505056..c963f46 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -377,6 +377,16 @@ inline XmlOutput::xml_output valueTagT( const triState v)
 }
 
 
+static QString vcxCommandSeparator()
+{
+    // MSBuild puts the contents of the custom commands into a batch file and calls it.
+    // As we want every sub-command to be error-checked (as is done by makefile-based
+    // backends), we insert the checks ourselves, using the undocumented jump target.
+    static QString cmdSep =
+            QLatin1String("&#x000D;&#x000A;if errorlevel 1 goto VCEnd&#x000D;&#x000A;");
+    return cmdSep;
+}
+
 // VCXCLCompilerTool -------------------------------------------------
 VCXCLCompilerTool::VCXCLCompilerTool()
     :   BrowseInformation(_False),
@@ -2142,32 +2152,6 @@ VCXCustomBuildTool::VCXCustomBuildTool()
 
 XmlOutput &operator<<(XmlOutput &xml, const VCXCustomBuildTool &tool)
 {
-    // The code below offers two ways to split custom build step commands.
-    // Normally the $$escape_expand(\n\t) is used in a project file, which is correctly translated
-    // in all generators. However, if you use $$escape_expand(\n\r) (or \n\h) instead, the VCPROJ
-    // generator will instead of binding the commands with " && " will insert a proper newline into
-    // the VCPROJ file. We sometimes use this method of splitting commands if the custom buildstep
-    // contains a command-line which is too big to run on certain OS.
-    QString cmds;
-    int end = tool.CommandLine.count();
-    for(int i = 0; i < end; ++i) {
-        QString cmdl = tool.CommandLine.at(i);
-        if (cmdl.contains("\r\t")) {
-            if (i == end - 1)
-                cmdl = cmdl.trimmed();
-            cmdl.replace("\r\t", " && ");
-        } else if (cmdl.contains("\r\n")) {
-            ;
-        } else if (cmdl.contains("\r\\h")) {
-            // The above \r\n should work, but doesn't, so we have this hack
-            cmdl.replace("\r\\h", "\r\n");
-        } else {
-            if (i < end - 1)
-                cmdl += " && ";
-        }
-        cmds += cmdl;
-    }
-
     if ( !tool.AdditionalDependencies.isEmpty() )
     {
         xml << tag("AdditionalInputs")
@@ -2175,11 +2159,11 @@ XmlOutput &operator<<(XmlOutput &xml, const VCXCustomBuildTool &tool)
             << valueTagDefX(tool.AdditionalDependencies, "AdditionalInputs", ";");
     }
 
-    if( !cmds.isEmpty() )
+    if( !tool.CommandLine.isEmpty() )
     {
         xml << tag("Command")
             << attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.ConfigName))
-            << valueTag(cmds);
+            << valueTag(tool.CommandLine.join(vcxCommandSeparator()));
     }
 
     if ( !tool.Description.isEmpty() )
@@ -2249,7 +2233,7 @@ XmlOutput &operator<<(XmlOutput &xml, const VCXEventTool &tool)
 {
     return xml
         << tag(tool.EventName)
-        << attrTagS(_Command, tool.CommandLine)
+        << attrTagS(_Command, tool.CommandLine.join(vcxCommandSeparator()))
         << attrTagS(_Message, tool.Description)
         << closetag(tool.EventName);
 }
@@ -2525,7 +2509,7 @@ bool VCXFilter::addExtraCompiler(const VCXFilterFile &info)
         if (!CustomBuildTool.Description.isEmpty())
             CustomBuildTool.Description += " & ";
         CustomBuildTool.Description += cmd_name;
-        CustomBuildTool.CommandLine += cmd.trimmed().split("\n", QString::SkipEmptyParts);
+        CustomBuildTool.CommandLine += VCToolBase::fixCommandLine(cmd.trimmed());
         int space = cmd.indexOf(' ');
         QFileInfo finf(cmd.left(space));
         if (CustomBuildTool.ToolPath.isEmpty())
diff --git a/qmake/generators/win32/msbuild_objectmodel.h b/qmake/generators/win32/msbuild_objectmodel.h
index 567985d..acca6c1 100644
--- a/qmake/generators/win32/msbuild_objectmodel.h
+++ b/qmake/generators/win32/msbuild_objectmodel.h
@@ -382,7 +382,7 @@ protected:
 
 public:
     // Variables
-    QString                 CommandLine;
+    QStringList             CommandLine;
     QString                 Description;
     triState                UseInBuild;
     QString                 EventName;
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 980e686..df414ea 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -280,6 +280,24 @@ inline XmlOutput::xml_output attrX(const char *name, const QStringList &v, const
     return attr(name, v.join(s));
 }
 
+// VCToolBase -------------------------------------------------
+QStringList VCToolBase::fixCommandLine(const QString &input)
+{
+    // The splitting regexp is a bit bizarre for backwards compat reasons (why else ...).
+    return input.split(QRegExp(QLatin1String("\n\t|\r\\h|\r\n")));
+}
+
+static QString vcCommandSeparator()
+{
+    // MSVC transforms the build tree into a single batch file, simply pasting the contents
+    // of the custom commands into it, and putting an "if errorlevel goto" statement behind it.
+    // As we want every sub-command to be error-checked (as is done by makefile-based
+    // backends), we insert the checks ourselves, using the undocumented jump target.
+    static QString cmdSep =
+            QLatin1String("&#x000D;&#x000A;if errorlevel 1 goto VCReportError&#x000D;&#x000A;");
+    return cmdSep;
+}
+
 // VCCLCompilerTool -------------------------------------------------
 VCCLCompilerTool::VCCLCompilerTool()
     :        AssemblerOutput(asmListingNone),
@@ -1913,36 +1931,11 @@ VCCustomBuildTool::VCCustomBuildTool()
 
 XmlOutput &operator<<(XmlOutput &xml, const VCCustomBuildTool &tool)
 {
-    // The code below offers two ways to split custom build step commands.
-    // Normally the $$escape_expand(\n\t) is used in a project file, which is correctly translated
-    // in all generators. However, if you use $$escape_expand(\n\r) (or \n\h) instead, the VCPROJ
-    // generator will instead of binding the commands with " && " will insert a proper newline into
-    // the VCPROJ file. We sometimes use this method of splitting commands if the custom buildstep
-    // contains a command-line which is too big to run on certain OS.
-    QString cmds;
-    int end = tool.CommandLine.count();
-    for(int i = 0; i < end; ++i) {
-        QString cmdl = tool.CommandLine.at(i);
-        if (cmdl.contains("\r\t")) {
-            if (i == end - 1)
-                cmdl = cmdl.trimmed();
-            cmdl.replace("\r\t", " && ");
-        } else if (cmdl.contains("\r\n")) {
-            ;
-        } else if (cmdl.contains("\r\\h")) {
-            // The above \r\n should work, but doesn't, so we have this hack
-            cmdl.replace("\r\\h", "\r\n");
-        } else {
-            if (i < end - 1)
-                cmdl += " && ";
-        }
-        cmds += cmdl;
-    }
     return xml
         << tag(_Tool)
             << attrS(_Name, tool.ToolName)
             << attrX(_AdditionalDependencies, tool.AdditionalDependencies, ";")
-            << attrS(_CommandLine, cmds)
+            << attrS(_CommandLine, tool.CommandLine.join(vcCommandSeparator()))
             << attrS(_Description, tool.Description)
             << attrX(_Outputs, tool.Outputs, ";")
             << attrS(_Path, tool.ToolPath)
@@ -2002,7 +1995,7 @@ XmlOutput &operator<<(XmlOutput &xml, const VCEventTool &tool)
         << tag(_Tool)
             << attrS(_Name, tool.ToolName)
             << attrS(_Path, tool.ToolPath)
-            << attrS(_CommandLine, tool.CommandLine)
+            << attrS(_CommandLine, tool.CommandLine.join(vcCommandSeparator()))
             << attrS(_Description, tool.Description)
             << attrT(_ExcludedFromBuild, tool.ExcludedFromBuild)
         << closetag(_Tool);
@@ -2296,7 +2289,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         if (!CustomBuildTool.Description.isEmpty())
             CustomBuildTool.Description += " & ";
         CustomBuildTool.Description += cmd_name;
-        CustomBuildTool.CommandLine += cmd.trimmed().split("\n", QString::SkipEmptyParts);
+        CustomBuildTool.CommandLine += VCToolBase::fixCommandLine(cmd.trimmed());
         int space = cmd.indexOf(' ');
         QFileInfo finf(cmd.left(space));
         if (CustomBuildTool.ToolPath.isEmpty())
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 97f8570..22013e0 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -475,6 +475,7 @@ public:
         for (QStringList::ConstIterator it=options.begin(); (it!=options.end()); it++)
             parseOption((*it).toLatin1());
     }
+    static QStringList fixCommandLine(const QString &input);
 };
 
 class VCConfiguration;
@@ -746,7 +747,7 @@ protected:
 
 public:
     // Variables
-    QString                 CommandLine;
+    QStringList             CommandLine;
     QString                 Description;
     triState                ExcludedFromBuild;
     QString                 ToolName;
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 8686ae8..cff7a14 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1027,37 +1027,23 @@ void VcprojGenerator::initPreBuildEventTools()
 {
 }
 
-QString VcprojGenerator::fixCommandLine(DotNET version, const QString &input) const
-{
-    QString result = input;
-
-    if (version >= NET2005)
-        result = result.replace(QLatin1Char('\n'), QLatin1String("&#x000D;&#x000A;"));
-
-    return result;
-}
-
 void VcprojGenerator::initPostBuildEventTools()
 {
     VCConfiguration &conf = vcProject.Configuration;
     if(!project->values("QMAKE_POST_LINK").isEmpty()) {
-        QString cmdline = fixCommandLine(conf.CompilerVersion, var("QMAKE_POST_LINK"));
+        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_POST_LINK"));
         conf.postBuild.CommandLine = cmdline;
-        if (conf.CompilerVersion < NET2005)
-            cmdline = cmdline.replace("\n", "&&");
-        conf.postBuild.Description = cmdline;
+        conf.postBuild.Description = cmdline.join(QLatin1String("\r\n"));
     }
 
     QString signature = !project->isEmpty("SIGNATURE_FILE") ? var("SIGNATURE_FILE") : var("DEFAULT_SIGNATURE");
     bool useSignature = !signature.isEmpty() && !project->isActiveConfig("staticlib") &&
                         !project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH");
     if(useSignature)
-        conf.postBuild.CommandLine.prepend(QLatin1String("signtool sign /F ") + signature + " \"$(TargetPath)\"\n" +
-            (!conf.postBuild.CommandLine.isEmpty() ? " && " : ""));
+        conf.postBuild.CommandLine.prepend(
+                QLatin1String("signtool sign /F ") + signature + QLatin1String(" \"$(TargetPath)\""));
 
     if(!project->values("MSVCPROJ_COPY_DLL").isEmpty()) {
-        if(!conf.postBuild.CommandLine.isEmpty())
-            conf.postBuild.CommandLine += " && ";
         conf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC");
         conf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL");
     }
@@ -1186,9 +1172,9 @@ void VcprojGenerator::initPreLinkEventTools()
 {
     VCConfiguration &conf = vcProject.Configuration;
     if(!project->values("QMAKE_PRE_LINK").isEmpty()) {
-        QString cmdline = fixCommandLine(conf.CompilerVersion, var("QMAKE_PRE_LINK"));
-        conf.preLink.Description = cmdline;
+        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_PRE_LINK"));
         conf.preLink.CommandLine = cmdline;
+        conf.preLink.Description = cmdline.join(QLatin1String("\r\n"));
     }
 }
 
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index 8f028a1..05e765e 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -130,7 +130,6 @@ protected:
     QList<VcprojGenerator*> mergedProjects;
 
 private:
-    QString fixCommandLine(DotNET version, const QString &input) const;
     QUuid increaseUUID(const QUuid &id);
     friend class VCFilter;
 };
diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp
index 271d9ae..396d2bf 100644
--- a/qmake/generators/win32/msvc_vcxproj.cpp
+++ b/qmake/generators/win32/msvc_vcxproj.cpp
@@ -380,9 +380,9 @@ void VcxprojGenerator::initPostBuildEventTools()
 {
     VCXConfiguration &conf = vcxProject.Configuration;
     if(!project->values("QMAKE_POST_LINK").isEmpty()) {
-        QString cmdline = var("QMAKE_POST_LINK");
+        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_POST_LINK"));
         conf.postBuild.CommandLine = cmdline;
-        conf.postBuild.Description = cmdline;
+        conf.postBuild.Description = cmdline.join(QLatin1String("\r\n"));
         conf.postBuild.UseInBuild = _True;
     }
 
@@ -390,14 +390,12 @@ void VcxprojGenerator::initPostBuildEventTools()
     bool useSignature = !signature.isEmpty() && !project->isActiveConfig("staticlib") &&
                         !project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH");
     if(useSignature) {
-         conf.postBuild.CommandLine.prepend(QLatin1String("signtool sign /F ") + signature + " \"$(TargetPath)\"\n" +
-             (!conf.postBuild.CommandLine.isEmpty() ? " && " : ""));
+        conf.postBuild.CommandLine.prepend(
+                QLatin1String("signtool sign /F ") + signature + QLatin1String(" \"$(TargetPath)\""));
         conf.postBuild.UseInBuild = _True;
     }
 
     if(!project->values("MSVCPROJ_COPY_DLL").isEmpty()) {
-        if(!conf.postBuild.CommandLine.isEmpty())
-            conf.postBuild.CommandLine += " && ";
         conf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC");
         conf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL");
         conf.postBuild.UseInBuild = _True;
@@ -530,9 +528,9 @@ void VcxprojGenerator::initPreLinkEventTools()
 {
     VCXConfiguration &conf = vcxProject.Configuration;
     if(!project->values("QMAKE_PRE_LINK").isEmpty()) {
-        QString cmdline = var("QMAKE_PRE_LINK");
-        conf.preLink.Description = cmdline;
+        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_PRE_LINK"));
         conf.preLink.CommandLine = cmdline;
+        conf.preLink.Description = cmdline.join(QLatin1String("\r\n"));
         conf.preLink.UseInBuild = _True;
     }
 }
-- 
cgit v0.12


From 474295602d473078aebff00a8d2e8265cdc5d424 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 5 Oct 2010 19:12:02 +0200
Subject: make QMAKE_POST_LINK handling in nmake generator sane

there is no point in &&-ing it with a possibly present signature command
- putting it on a line of its own works just fine - with the added
benefit of not breaking if it contains operators itself.

Reviewed-by: mariusSO
---
 qmake/generators/win32/msvc_nmake.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 92e8aeb..907f8dc 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -310,10 +310,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t)
         t << "\n\tsigntool sign /F " << signature << " $(DESTDIR_TARGET)";
     }
     if(!project->isEmpty("QMAKE_POST_LINK")) {
-        if (useSignature)
-            t << " && " << var("QMAKE_POST_LINK");
-        else
-            t << "\n\t" << var("QMAKE_POST_LINK");
+        t << "\n\t" << var("QMAKE_POST_LINK");
     }
     t << endl;
 }
-- 
cgit v0.12


From edb1e43f0ad7aece24929d95542490da7f88321f Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 5 Oct 2010 19:27:00 +0200
Subject: rebuild configure.exe

---
 configure.exe | Bin 1402368 -> 1325568 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/configure.exe b/configure.exe
index e2f4331..f8d520a 100755
Binary files a/configure.exe and b/configure.exe differ
-- 
cgit v0.12


From d75dad653d651eb725b238ad9db4dccd6a1f1d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@nokia.com>
Date: Tue, 5 Oct 2010 18:12:03 +0200
Subject: qmake: Ensure right library order when reducing duplicate libraries

Commit 3ed9e2788e8 changed the logic from using lookahead to checking
if the library already existed in the arguments parsed so far. This
broke the case -lFoo -lBar -lFoo where Bar depends on symbols in Foo.
Since we were reducing this to -lFoo -lBar, the linker would not know
which missing symbols to include from Foo when encountering the -lFoo
argument.

We now keep the library order when building the final argument list,
by making sure the position of a duplicated library is always that
of the last instance of that library.

Task-number: QTBUG-13944
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
---
 qmake/generators/unix/unixmake.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index da4bbb7..c26fcb4 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -636,11 +636,13 @@ UnixMakefileGenerator::processPrlFiles()
 
                     if(opt.startsWith("-L") ||
                        (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F"))) {
-                        if(lit == 0 || !lflags[arch].contains(opt))
+                        if(!lflags[arch].contains(opt))
                             lflags[arch].append(opt);
                     } else if(opt.startsWith("-l")) {
-                        if(lit == l.size()-1 || !lflags[arch].contains(opt))
-                            lflags[arch].append(opt);
+                        // Make sure we keep the dependency-order of libraries
+                        if (lflags[arch].contains(opt))
+                            lflags[arch].removeAll(opt);
+                        lflags[arch].append(opt);
                     } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) {
                         if(opt.length() > 11)
                             opt = opt.mid(11);
@@ -672,7 +674,7 @@ UnixMakefileGenerator::processPrlFiles()
                         lflags[arch].append(opt);
                     }
                 } else if(!opt.isNull()) {
-                    if(lit == 0 || l.lastIndexOf(opt, lit-1) == -1)
+                    if(!lflags[arch].contains(opt))
                         lflags[arch].append(opt);
                 }
             }
-- 
cgit v0.12


From 9c2361fa3b0ce2417a26537a3ecfe17c2b3ca6d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@nokia.com>
Date: Tue, 5 Oct 2010 18:23:57 +0200
Subject: qmake: Include -pthread when reducing duplicate library arguments

Reviwed-by: Simon Hausmann <simon.hausmann@nokia.com>
---
 qmake/generators/unix/unixmake.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index c26fcb4..71a6061 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -638,7 +638,7 @@ UnixMakefileGenerator::processPrlFiles()
                        (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F"))) {
                         if(!lflags[arch].contains(opt))
                             lflags[arch].append(opt);
-                    } else if(opt.startsWith("-l")) {
+                    } else if(opt.startsWith("-l") || opt == "-pthread") {
                         // Make sure we keep the dependency-order of libraries
                         if (lflags[arch].contains(opt))
                             lflags[arch].removeAll(opt);
-- 
cgit v0.12


From 6b118e981b0da4e7bcfd99be6ba1d0123885e7b3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 6 Oct 2010 10:29:55 +0200
Subject: fix regexp in "make custom command handling in vc(x)proj files sane"

---
 qmake/generators/win32/msvc_objectmodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index df414ea..f5ca1be 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -284,7 +284,7 @@ inline XmlOutput::xml_output attrX(const char *name, const QStringList &v, const
 QStringList VCToolBase::fixCommandLine(const QString &input)
 {
     // The splitting regexp is a bit bizarre for backwards compat reasons (why else ...).
-    return input.split(QRegExp(QLatin1String("\n\t|\r\\h|\r\n")));
+    return input.split(QRegExp(QLatin1String("\n\t|\r\\\\h|\r\n")));
 }
 
 static QString vcCommandSeparator()
-- 
cgit v0.12


From 62ee836fafe515c03b0be716585f8c2354e188f7 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Tue, 5 Oct 2010 17:39:57 +0200
Subject: Fix copying large data to non-Qt applications

In send_selection when we decide to use INCR properties we set the
given property value to be INCR atom, however we were also sending
SelectionNotify event containing the name of the property that the
client should watch as INCR, which is wrong, we should send the
original property that we were asked to use instead.

This fixes copying large junks of data from Qt application, for
example copying text (>200k) to gedit or images to gimp.

Task-number: QTBUG-8644
Reviewed-by: Bradley T. Hughes
---
 src/gui/kernel/qclipboard_x11.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp
index 4b75f0a..b7ca2d4 100644
--- a/src/gui/kernel/qclipboard_x11.cpp
+++ b/src/gui/kernel/qclipboard_x11.cpp
@@ -836,7 +836,7 @@ static Atom send_selection(QClipboardData *d, Atom target, Window window, Atom p
                             ATOM(INCR), 32, PropModeReplace, (uchar *) &bytes, 1);
 
             (void)new QClipboardINCRTransaction(window, property, atomFormat, dataFormat, data, increment);
-            return ATOM(INCR);
+            return property;
         }
 
         // make sure we can perform the XChangeProperty in a single request
-- 
cgit v0.12


From 4b81cb847647450f4bad8a0d9a278d43ebdfecc6 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Wed, 6 Oct 2010 10:31:37 +0200
Subject: Fixed a buffer overrun when pasting large data from non-Qt apps

When we receive a COMPOUND_TEXT data and convert it to multi-byte, if
the new length is less than the original buffer, we resize the buffer,
but then we need to make sure we reset the buffer_offset variable,
which is returned as a "size" of the buffer to a caller.

The conversion to COMPOUND_TEXT format was totally wrong, we were using
the wrong length of the input text, so the converted string was
truncated.

Task-number: QTBUG-8644
Reviewed-by: Bradley T. Hughes
---
 src/gui/kernel/qclipboard_x11.cpp | 22 +++++++++-------------
 src/gui/kernel/qdnd_x11.cpp       |  2 +-
 src/gui/kernel/qmotifdnd_x11.cpp  |  2 +-
 src/gui/kernel/qt_x11_p.h         |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp
index b7ca2d4..55548ef 100644
--- a/src/gui/kernel/qclipboard_x11.cpp
+++ b/src/gui/kernel/qclipboard_x11.cpp
@@ -595,7 +595,7 @@ static inline int maxSelectionIncr(Display *dpy)
 { return XMaxRequestSize(dpy) > 65536 ? 65536*4 : XMaxRequestSize(dpy)*4 - 100; }
 
 bool QX11Data::clipboardReadProperty(Window win, Atom property, bool deleteProperty,
-                                     QByteArray *buffer, int *size, Atom *type, int *format, bool nullterm)
+                                     QByteArray *buffer, int *size, Atom *type, int *format)
 {
     int           maxsize = maxSelectionIncr(display);
     ulong  bytes_left; // bytes_after
@@ -641,13 +641,13 @@ bool QX11Data::clipboardReadProperty(Window win, Atom property, bool deletePrope
         break;
     }
 
-    int newSize = proplen + (nullterm ? 1 : 0);
+    int newSize = proplen;
     buffer->resize(newSize);
 
     bool ok = (buffer->size() == newSize);
     VDEBUG("QClipboard: read_property(): buffer resized to %d", buffer->size());
 
-    if (ok) {
+    if (ok && newSize) {
         // could allocate buffer
 
         while (bytes_left) {
@@ -683,23 +683,19 @@ bool QX11Data::clipboardReadProperty(Window win, Atom property, bool deletePrope
             XTextProperty textprop;
             textprop.encoding = *type;
             textprop.format = *format;
-            textprop.nitems = length;
+            textprop.nitems = buffer_offset;
             textprop.value = (unsigned char *) buffer->data();
 
             char **list_ret = 0;
             int count;
             if (XmbTextPropertyToTextList(display, &textprop, &list_ret,
                          &count) == Success && count && list_ret) {
-                offset = strlen(list_ret[0]);
-                buffer->resize(offset + (nullterm ? 1 : 0));
+                offset = buffer_offset = strlen(list_ret[0]);
+                buffer->resize(offset);
                 memcpy(buffer->data(), list_ret[0], offset);
             }
             if (list_ret) XFreeStringList(list_ret);
         }
-
-        // zero-terminate (for text)
-        if (nullterm)
-            buffer->data()[buffer_offset] = '\0';
     }
 
     // correct size, not 0-term.
@@ -742,7 +738,7 @@ QByteArray QX11Data::clipboardReadIncrementalProperty(Window win, Atom property,
         if (event.xproperty.atom != property ||
              event.xproperty.state != PropertyNewValue)
             continue;
-        if (X11->clipboardReadProperty(win, property, true, &tmp_buf, &length, 0, 0, false)) {
+        if (X11->clipboardReadProperty(win, property, true, &tmp_buf, &length, 0, 0)) {
             if (length == 0) {                // no more data, we're done
                 if (nullterm) {
                     buf.resize(offset+1);
@@ -1070,7 +1066,7 @@ bool QClipboard::event(QEvent *e)
                 QByteArray multi_data;
                 if (req->property == XNone
                     || !X11->clipboardReadProperty(req->requestor, req->property, false, &multi_data,
-                                                   0, &multi_type, &multi_format, 0)
+                                                   0, &multi_type, &multi_format)
                     || multi_format != 32) {
                     // MULTIPLE property not formatted correctly
                     XSendEvent(dpy, req->requestor, False, NoEventMask, &event);
@@ -1292,7 +1288,7 @@ QByteArray QClipboardWatcher::getDataInFormat(Atom fmtatom) const
     Atom   type;
     XSelectInput(dpy, win, PropertyChangeMask);
 
-    if (X11->clipboardReadProperty(win, ATOM(_QT_SELECTION), true, &buf, 0, &type, 0, false)) {
+    if (X11->clipboardReadProperty(win, ATOM(_QT_SELECTION), true, &buf, 0, &type, 0)) {
         if (type == ATOM(INCR)) {
             int nbytes = buf.size() >= 4 ? *((int*)buf.data()) : 0;
             buf = X11->clipboardReadIncrementalProperty(win, ATOM(_QT_SELECTION), nbytes, false);
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index 92dd0a1..68d7688 100644
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -1887,7 +1887,7 @@ static QVariant xdndObtainData(const char *format, QVariant::Type requestedType)
     if (got) {
         Atom type;
 
-        if (X11->clipboardReadProperty(tw->effectiveWinId(), ATOM(XdndSelection), true, &result, 0, &type, 0, false)) {
+        if (X11->clipboardReadProperty(tw->effectiveWinId(), ATOM(XdndSelection), true, &result, 0, &type, 0)) {
             if (type == ATOM(INCR)) {
                 int nbytes = result.size() >= 4 ? *((int*)result.data()) : 0;
                 result = X11->clipboardReadIncrementalProperty(tw->effectiveWinId(), ATOM(XdndSelection), nbytes, false);
diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/kernel/qmotifdnd_x11.cpp
index 0a7b350..3334455 100644
--- a/src/gui/kernel/qmotifdnd_x11.cpp
+++ b/src/gui/kernel/qmotifdnd_x11.cpp
@@ -766,7 +766,7 @@ QVariant QX11Data::motifdndObtainData(const char *mimeType)
     if (got) {
         Atom type;
 
-        if (X11->clipboardReadProperty(tw->internalWinId(), Dnd_selection, true, &result, 0, &type, 0, false)) {
+        if (X11->clipboardReadProperty(tw->internalWinId(), Dnd_selection, true, &result, 0, &type, 0)) {
         }
     }
 
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h
index 7383382..d62d9c3 100644
--- a/src/gui/kernel/qt_x11_p.h
+++ b/src/gui/kernel/qt_x11_p.h
@@ -350,7 +350,7 @@ struct QX11Data
     // from qclipboard_x11.cpp
     bool clipboardWaitForEvent(Window win, int type, XEvent *event, int timeout);
     bool clipboardReadProperty(Window win, Atom property, bool deleteProperty,
-                            QByteArray *buffer, int *size, Atom *type, int *format, bool nullterm);
+                            QByteArray *buffer, int *size, Atom *type, int *format);
     QByteArray clipboardReadIncrementalProperty(Window win, Atom property, int nbytes, bool nullterm);
 
     // from qdnd_x11.cpp
-- 
cgit v0.12


From e98962aab2db1c3760b324d6640fa8b510b7e04c Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Wed, 6 Oct 2010 12:46:45 +0200
Subject: tst_qtcpsocket: Attempt to reproduce QTBUG-14268

The test (un)fortunately passes :-)

Task-number: QTBUG-14268
---
 tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 71 ++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index 31cae40..5b77006 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -201,6 +201,9 @@ private slots:
     void proxyFactory_data();
     void proxyFactory();
 
+    void qtbug14268_peek();
+
+
 protected slots:
     void nonBlockingIMAP_hostFound();
     void nonBlockingIMAP_connected();
@@ -251,6 +254,41 @@ enum ProxyTests {
 
 int tst_QTcpSocket::loopLevel = 0;
 
+class SocketPair: public QObject
+{
+    Q_OBJECT
+public:
+    QTcpSocket *endPoints[2];
+
+    SocketPair(QObject *parent = 0)
+        : QObject(parent)
+    {
+        endPoints[0] = endPoints[1] = 0;
+    }
+
+    bool create()
+    {
+        QTcpServer server;
+        server.listen();
+
+        QTcpSocket *active = new QTcpSocket(this);
+        active->connectToHost("127.0.0.1", server.serverPort());
+
+        if (!active->waitForConnected(1000))
+            return false;
+
+        if (!server.waitForNewConnection(1000))
+            return false;
+
+        QTcpSocket *passive = server.nextPendingConnection();
+        passive->setParent(this);
+
+        endPoints[0] = active;
+        endPoints[1] = passive;
+        return true;
+    }
+};
+
 tst_QTcpSocket::tst_QTcpSocket()
 {
     Q_SET_DEFAULT_IAP
@@ -2467,6 +2505,39 @@ void tst_QTcpSocket::proxyFactory()
     delete socket;
 }
 
+void tst_QTcpSocket::qtbug14268_peek()
+{
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy)
+        return;
+
+    SocketPair socketPair;
+    QVERIFY(socketPair.create());
+    QTcpSocket *outgoing = socketPair.endPoints[0];
+    QTcpSocket *incoming = socketPair.endPoints[1];
+
+    QVERIFY(incoming->state() == QTcpSocket::ConnectedState);
+    QVERIFY(outgoing->state() == QTcpSocket::ConnectedState);
+
+    outgoing->write("abc");
+    QVERIFY(outgoing->waitForBytesWritten(2000));
+    QVERIFY(incoming->waitForReadyRead(2000));
+    QVERIFY(incoming->peek(128*1024) == QByteArray("abc"));
+
+    outgoing->write("def");
+    QVERIFY(outgoing->waitForBytesWritten(2000));
+    QVERIFY(incoming->waitForReadyRead(2000));
+    QVERIFY(incoming->peek(128*1024) == QByteArray("abcdef"));
+
+    outgoing->write("ghi");
+    QVERIFY(outgoing->waitForBytesWritten(2000));
+    QVERIFY(incoming->waitForReadyRead(2000));
+    QVERIFY(incoming->peek(128*1024) == QByteArray("abcdefghi"));
+
+    QVERIFY(incoming->read(128*1024) == QByteArray("abcdefghi"));
+}
+
+
 
 QTEST_MAIN(tst_QTcpSocket)
 #include "tst_qtcpsocket.moc"
-- 
cgit v0.12


From ccd3f663c8c96e266b173a6f825bccec830007e1 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Wed, 6 Oct 2010 10:31:06 +0200
Subject: Fix crash when constructing QThreadStorage after global destructors
 have run

In this particular case, the destructors vector used by
QThreadStorageData has already been destroyed, yet a new QThreadStorage
is being allocated. This can only happen during global destruction, at
which point we assume that there is only one thread. In order to keep
QThreadStorage working, we need somewhere to store the data, and the
best place we have in this situation is at the tail of the current
thread's tls vector. The destructor is ignored, since we have no where
to store it, and no way to actually call it.

Task-number: QTBUG-10084
Reviewed-by: thiago
Reviewed-by: olivier
---
 src/corelib/thread/qthreadstorage.cpp            | 21 +++++++-
 tests/auto/qthreadstorage/crashOnExit.cpp        | 64 ++++++++++++++++++++++++
 tests/auto/qthreadstorage/crashOnExit.pro        |  4 ++
 tests/auto/qthreadstorage/qthreadstorage.pro     |  8 +--
 tests/auto/qthreadstorage/tst_qthreadstorage.cpp |  9 ++++
 tests/auto/qthreadstorage/tst_qthreadstorage.pro |  4 ++
 6 files changed, 104 insertions(+), 6 deletions(-)
 create mode 100644 tests/auto/qthreadstorage/crashOnExit.cpp
 create mode 100644 tests/auto/qthreadstorage/crashOnExit.pro
 create mode 100644 tests/auto/qthreadstorage/tst_qthreadstorage.pro

diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp
index 88d73cc..2fc04f5 100644
--- a/src/corelib/thread/qthreadstorage.cpp
+++ b/src/corelib/thread/qthreadstorage.cpp
@@ -79,6 +79,21 @@ QThreadStorageData::QThreadStorageData(void (*func)(void *))
 {
     QMutexLocker locker(mutex());
     DestructorMap *destr = destructors();
+    if (!destr) {
+        /*
+         the destructors vector has already been destroyed, yet a new
+         QThreadStorage is being allocated. this can only happen during global
+         destruction, at which point we assume that there is only one thread.
+         in order to keep QThreadStorage working, we need somewhere to store
+         the data, best place we have in this situation is at the tail of the
+         current thread's tls vector. the destructor is ignored, since we have
+         no where to store it, and no way to actually call it.
+         */
+        QThreadData *data = QThreadData::current();
+        id = data->tls.count();
+        DEBUG_MSG("QThreadStorageData: Allocated id %d, destructor %p cannot be stored", id, func);
+        return;
+    }
     for (id = 0; id < destr->count(); id++) {
         if (destr->at(id) == 0)
             break;
@@ -139,13 +154,15 @@ void **QThreadStorageData::set(void *p)
                 data->thread);
 
         QMutexLocker locker(mutex());
-        void (*destructor)(void *) = destructors()->value(id);
+        DestructorMap *destr = destructors();
+        void (*destructor)(void *) = destr ? destr->value(id) : 0;
         locker.unlock();
 
         void *q = value;
         value = 0;
 
-        destructor(q);
+        if (destructor)
+            destructor(q);
     }
 
     // store new data
diff --git a/tests/auto/qthreadstorage/crashOnExit.cpp b/tests/auto/qthreadstorage/crashOnExit.cpp
new file mode 100644
index 0000000..96515a0
--- /dev/null
+++ b/tests/auto/qthreadstorage/crashOnExit.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QtCore>
+
+class Class
+{
+public:
+    ~Class()
+    {
+        // trigger creation of a new QThreadStorage, after the previous QThreadStorage from main() was destructed
+        static QThreadStorage<int *> threadstorage;
+        threadstorage.setLocalData(new int);
+        threadstorage.setLocalData(new int);
+    }
+};
+
+int main()
+{
+    // instantiate the class that will use QThreadStorage from its destructor, it's destructor will be run last
+    static Class instance;
+    // instantiate QThreadStorage, it's destructor (and the global destructors for QThreadStorages internals) will run first
+    static QThreadStorage<int *> threadstorage;
+    threadstorage.setLocalData(new int);
+    threadstorage.setLocalData(new int);
+}
diff --git a/tests/auto/qthreadstorage/crashOnExit.pro b/tests/auto/qthreadstorage/crashOnExit.pro
new file mode 100644
index 0000000..918ef39
--- /dev/null
+++ b/tests/auto/qthreadstorage/crashOnExit.pro
@@ -0,0 +1,4 @@
+SOURCES += crashOnExit.cpp
+QT = core
+CONFIG-=app_bundle
+CONFIG+=console
diff --git a/tests/auto/qthreadstorage/qthreadstorage.pro b/tests/auto/qthreadstorage/qthreadstorage.pro
index 3071098..a06f89c 100644
--- a/tests/auto/qthreadstorage/qthreadstorage.pro
+++ b/tests/auto/qthreadstorage/qthreadstorage.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
-SOURCES += tst_qthreadstorage.cpp
-QT = core
-symbian:LIBS += -llibpthread
+TEMPLATE = subdirs
+SUBDIRS = \
+    tst_qthreadstorage.pro \
+    crashOnExit.pro
diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
index d8b404f..097d729 100644
--- a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
@@ -76,6 +76,7 @@ private slots:
     void autoDelete();
     void adoptedThreads();
     void ensureCleanupOrder();
+    void QTBUG13877_crashOnExit();
 };
 
 class Pointer
@@ -293,5 +294,13 @@ void tst_QThreadStorage::ensureCleanupOrder()
     QVERIFY(First::order < Second::order);
 }
 
+void tst_QThreadStorage::QTBUG13877_crashOnExit()
+{
+    QProcess process;
+    process.start("./crashOnExit");
+    QVERIFY(process.waitForFinished());
+    QVERIFY(process.exitStatus() != QProcess::CrashExit);
+}
+
 QTEST_MAIN(tst_QThreadStorage)
 #include "tst_qthreadstorage.moc"
diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.pro b/tests/auto/qthreadstorage/tst_qthreadstorage.pro
new file mode 100644
index 0000000..3071098
--- /dev/null
+++ b/tests/auto/qthreadstorage/tst_qthreadstorage.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+SOURCES += tst_qthreadstorage.cpp
+QT = core
+symbian:LIBS += -llibpthread
-- 
cgit v0.12


From 83b4cad278e2c3b0ca16affc76a82ddce9d6149a Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Wed, 6 Oct 2010 13:46:15 +0200
Subject: tst_qtcpserver: Another attempt to reproduce QTBUG-14268

The test (un)fortunately passes :-)

Task-number: QTBUG-14268
---
 tests/auto/qtcpserver/tst_qtcpserver.cpp | 53 ++++++++++++++++++++++++++++++++
 tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 15 ++++-----
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/tests/auto/qtcpserver/tst_qtcpserver.cpp b/tests/auto/qtcpserver/tst_qtcpserver.cpp
index b2151b9..ab2a32d 100644
--- a/tests/auto/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/qtcpserver/tst_qtcpserver.cpp
@@ -105,6 +105,8 @@ private slots:
     void invalidProxy();
     void proxyFactory_data();
     void proxyFactory();
+
+    void qtbug14268_peek();
 };
 
 // Testing get/set functions
@@ -662,5 +664,56 @@ void tst_QTcpServer::proxyFactory()
     QTEST(int(server.serverError()), "expectedError");
 }
 
+class Qtbug14268Helper : public QObject
+{
+    Q_OBJECT
+public:
+    QByteArray lastDataPeeked;
+public slots:
+    void newConnection() {
+        QTcpServer* server=static_cast<QTcpServer*>(sender());
+        QTcpSocket* s=server->nextPendingConnection();
+        connect(s,SIGNAL(readyRead()),this,SLOT(onServerReadyRead()));
+    }
+    void onServerReadyRead() {
+        QTcpSocket* clientSocket=static_cast<QTcpSocket*>(sender());
+        lastDataPeeked = clientSocket->peek(128*1024).toHex();
+        QTestEventLoop::instance().exitLoop();
+    }
+};
+
+// there is a similar test inside tst_qtcpsocket that uses the waitFor* functions instead
+void tst_QTcpServer::qtbug14268_peek()
+{
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy)
+        return;
+
+    QTcpServer server;
+    server.listen();
+
+    Qtbug14268Helper helper;
+    QObject::connect(&server, SIGNAL(newConnection()), &helper, SLOT(newConnection()));
+
+    QTcpSocket client;
+    client.connectToHost(QHostAddress::LocalHost, server.serverPort());
+    QVERIFY(client.waitForConnected(2000));
+
+    client.write("abc\n");
+    QTestEventLoop::instance().enterLoop(5);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+    QVERIFY(helper.lastDataPeeked == QByteArray("6162630a"));
+
+    client.write("def\n");
+    QTestEventLoop::instance().enterLoop(5);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+    QVERIFY(helper.lastDataPeeked == QByteArray("6162630a6465660a"));
+
+    client.write("ghi\n");
+    QTestEventLoop::instance().enterLoop(5);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+    QVERIFY(helper.lastDataPeeked == QByteArray("6162630a6465660a6768690a"));
+}
+
 QTEST_MAIN(tst_QTcpServer)
 #include "tst_qtcpserver.moc"
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index 5b77006..2dbe5b7 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -2505,6 +2505,7 @@ void tst_QTcpSocket::proxyFactory()
     delete socket;
 }
 
+// there is a similar test inside tst_qtcpserver that uses the event loop instead
 void tst_QTcpSocket::qtbug14268_peek()
 {
     QFETCH_GLOBAL(bool, setProxy);
@@ -2519,22 +2520,22 @@ void tst_QTcpSocket::qtbug14268_peek()
     QVERIFY(incoming->state() == QTcpSocket::ConnectedState);
     QVERIFY(outgoing->state() == QTcpSocket::ConnectedState);
 
-    outgoing->write("abc");
+    outgoing->write("abc\n");
     QVERIFY(outgoing->waitForBytesWritten(2000));
     QVERIFY(incoming->waitForReadyRead(2000));
-    QVERIFY(incoming->peek(128*1024) == QByteArray("abc"));
+    QVERIFY(incoming->peek(128*1024) == QByteArray("abc\n"));
 
-    outgoing->write("def");
+    outgoing->write("def\n");
     QVERIFY(outgoing->waitForBytesWritten(2000));
     QVERIFY(incoming->waitForReadyRead(2000));
-    QVERIFY(incoming->peek(128*1024) == QByteArray("abcdef"));
+    QVERIFY(incoming->peek(128*1024) == QByteArray("abc\ndef\n"));
 
-    outgoing->write("ghi");
+    outgoing->write("ghi\n");
     QVERIFY(outgoing->waitForBytesWritten(2000));
     QVERIFY(incoming->waitForReadyRead(2000));
-    QVERIFY(incoming->peek(128*1024) == QByteArray("abcdefghi"));
+    QVERIFY(incoming->peek(128*1024) == QByteArray("abc\ndef\nghi\n"));
 
-    QVERIFY(incoming->read(128*1024) == QByteArray("abcdefghi"));
+    QVERIFY(incoming->read(128*1024) == QByteArray("abc\ndef\nghi\n"));
 }
 
 
-- 
cgit v0.12


From eae8c143428128a4bea4c06cff93b38189da267d Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Thu, 7 Oct 2010 08:49:30 +0200
Subject: Fix failure on Windows after commit ccd3f66

By default the builds are placed in either a release\ or debug\
directory, so we need to start the correct one on Windows.

Reviewed-by: trustme
---
 tests/auto/qthreadstorage/tst_qthreadstorage.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
index 097d729..ed86165 100644
--- a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
@@ -297,7 +297,15 @@ void tst_QThreadStorage::ensureCleanupOrder()
 void tst_QThreadStorage::QTBUG13877_crashOnExit()
 {
     QProcess process;
+#ifdef Q_OS_WIN
+# ifdef QT_NO_DEBUG
+    process.start("release/crashOnExit");
+# else
+    process.start("debug/crashOnExit");
+# endif
+#else
     process.start("./crashOnExit");
+#endif
     QVERIFY(process.waitForFinished());
     QVERIFY(process.exitStatus() != QProcess::CrashExit);
 }
-- 
cgit v0.12