Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

4 files changed, 20 insertions, 159 deletions

diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index 7a616e3d0b..63749122eb 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -1899,25 +1899,25 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
         case Tok_Comment:
             if (!tor)
                 goto case_default;
-            if (yyWord.startsWith(QLatin1Char(':'))) {
-                yyWord.remove(0, 1);
+            if (yyWord.at(0) == QLatin1Char(':') && yyWord.at(1).isSpace()) {
+                yyWord.remove(0, 2);
                 extracomment += yyWord;
                 extracomment.detach();
-            } else if (yyWord.startsWith(QLatin1Char('='))) {
-                yyWord.remove(0, 1);
+            } else if (yyWord.at(0) == QLatin1Char('=') && yyWord.at(1).isSpace()) {
+                yyWord.remove(0, 2);
                 msgid = yyWord.simplified();
                 msgid.detach();
-            } else if (yyWord.startsWith(QLatin1Char('~'))) {
-                yyWord.remove(0, 1);
+            } else if (yyWord.at(0) == QLatin1Char('~') && yyWord.at(1).isSpace()) {
+                yyWord.remove(0, 2);
                 text = yyWord.trimmed();
                 int k = text.indexOf(QLatin1Char(' '));
                 if (k > -1)
                     extra.insert(text.left(k), text.mid(k + 1).trimmed());
                 text.clear();
-            } else if (yyWord.startsWith(QLatin1Char('%'))) {
-                sourcetext.reserve(sourcetext.length() + yyWord.length());
+            } else if (yyWord.at(0) == QLatin1Char('%') && yyWord.at(1).isSpace()) {
+                sourcetext.reserve(sourcetext.length() + yyWord.length() - 2);
                 ushort *ptr = (ushort *)sourcetext.data() + sourcetext.length();
-                int p = 1, c;
+                int p = 2, c;
                 forever {
                     if (p >= yyWord.length())
                         break;
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf
deleted file mode 100644
index 2ff56822fc..0000000000
--- a/tools/qdoc3/test/qt-inc.qdocconf
+++ /dev/null
@@ -1,149 +0,0 @@
-include(compat.qdocconf)
-include(macros.qdocconf)
-
-project                 = Qt
-description             = Qt Reference Documentation
-url                     = http://qt.nokia.com/doc/4.6
-
-edition.Desktop         = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \
-                          QtDesigner QtAssistant Qt3Support QAxContainer \
-                          QAxServer QtUiTools QtTest QtDBus
-edition.DesktopLight    = QtCore QtGui Qt3SupportLight QtTest
-
-language                = Cpp
-
-norecursion             = true
-sources.fileextensions  = "*.cpp *.qdoc"
-sourcedirs              = $QDOC_CURRENT_DIR
-headerdirs              = $QDOC_CURRENT_DIR
-exampledirs             = $QTDIR/doc/src \
-                          $QTDIR/examples \
-                          $QTDIR \
-                          $QTDIR/qmake/examples \
-                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
-imagedirs               = $QTDIR/doc/src/images \
-                          $QTDIR/examples
-outputdir               = $QTDIR/doc/html
-indexdir                = $QTDIR/doc/indexes
-indexes                 = $QDOC_INPUT_INDEXES
-outputindex             = $QDOC_OUTPUT_INDEX
-base                    = file:$QTDIR/doc/html
-versionsym              = QT_VERSION_STR
-defines                 = Q_QDOC \
-                          QT_.*_SUPPORT \
-                          QT_.*_LIB \
-                          QT_COMPAT \
-                          QT_KEYPAD_NAVIGATION \
-                          QT3_SUPPORT \
-                          Q_WS_.* \
-                          Q_OS_.* \
-                          Q_BYTE_ORDER \
-                          __cplusplus
-
-codeindent              = 1
-extraimages.HTML        = qt-logo \
-                          trolltech-logo
-
-Cpp.ignoretokens        = QAXFACTORY_EXPORT \
-                          QDESIGNER_COMPONENTS_LIBRARY \
-                          QDESIGNER_EXTENSION_LIBRARY \
-                          QDESIGNER_SDK_LIBRARY \
-                          QDESIGNER_SHARED_LIBRARY \
-                          QDESIGNER_UILIB_LIBRARY \
-                          QM_EXPORT_CANVAS \
-                          QM_EXPORT_DNS \
-                          QM_EXPORT_DOM \
-                          QM_EXPORT_FTP \
-                          QM_EXPORT_HTTP \
-                          QM_EXPORT_ICONVIEW \
-                          QM_EXPORT_NETWORK \
-                          QM_EXPORT_OPENGL \
-                          QM_EXPORT_SQL \
-                          QM_EXPORT_TABLE \
-                          QM_EXPORT_WORKSPACE \
-                          QM_EXPORT_XML \
-                          QT_ASCII_CAST_WARN \
-                          QT_BEGIN_HEADER \
-                          QT_DESIGNER_STATIC \
-                          QT_END_HEADER \
-                          QT_WIDGET_PLUGIN_EXPORT \
-                          Q_COMPAT_EXPORT \
-                          Q_CORE_EXPORT \
-                          Q_EXPLICIT \
-                          Q_EXPORT \
-                          Q_EXPORT_CODECS_CN \
-                          Q_EXPORT_CODECS_JP \
-                          Q_EXPORT_CODECS_KR \
-                          Q_EXPORT_PLUGIN \
-                          Q_GFX_INLINE \
-                          Q_GUI_EXPORT \
-                          Q_GUI_EXPORT_INLINE \
-                          Q_GUI_EXPORT_STYLE_CDE \
-                          Q_GUI_EXPORT_STYLE_COMPACT \
-                          Q_GUI_EXPORT_STYLE_MAC \
-                          Q_GUI_EXPORT_STYLE_MOTIF \
-                          Q_GUI_EXPORT_STYLE_MOTIFPLUS \
-                          Q_GUI_EXPORT_STYLE_PLATINUM \
-                          Q_GUI_EXPORT_STYLE_POCKETPC \
-                          Q_GUI_EXPORT_STYLE_SGI \
-                          Q_GUI_EXPORT_STYLE_WINDOWS \
-                          Q_GUI_EXPORT_STYLE_WINDOWSXP \
-                          Q_INLINE_TEMPLATE \
-                          Q_NETWORK_EXPORT \
-                          Q_OPENGL_EXPORT \
-                          Q_OUTOFLINE_TEMPLATE \
-                          Q_SQL_EXPORT \
-                          Q_SVG_EXPORT \
-                          Q_SCRIPT_EXPORT \
-                          Q_TESTLIB_EXPORT \
-                          Q_TYPENAME \
-                          Q_XML_EXPORT \
-                          QDBUS_EXPORT \
-			  Q_GADGET \
-			  QWEBKIT_EXPORT
-Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
-                          Q_DECLARE_INTERFACE \
-                          Q_DECLARE_METATYPE \
-                          Q_DECLARE_OPERATORS_FOR_FLAGS \
-                          Q_DECLARE_PRIVATE \
-                          Q_DECLARE_PUBLIC \
-                          Q_DECLARE_SHARED \
-                          Q_DECLARE_TR_FUNCTIONS \
-                          Q_DECLARE_TYPEINFO \
-                          Q_DISABLE_COPY \
-                          Q_DUMMY_COMPARISON_OPERATOR \
-                          Q_ENUMS \
-                          Q_FLAGS \
-                          Q_INTERFACES \
-			  Q_OS_SYMBIAN \
-                          __attribute__
-
-HTML.stylesheets        = $QTDIR/util/qdoc3/test/classic.css
-HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n" \
-                          "<tr>\n" \
-                          "<td align=\"left\" valign=\"top\" width=\"32\">" \
-                          "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" width=\"32\" height=\"32\" border=\"0\" /></a>" \
-                          "</td>\n" \
-                          "<td width=\"1\">&nbsp;&nbsp;</td>" \
-                          "<td class=\"postheader\" valign=\"center\">" \
-                          "<a href=\"index.html\">" \
-                          "<font color=\"#004faf\">Home</font></a>&nbsp;&middot;" \
-                          " <a href=\"classes.html\">" \
-                          "<font color=\"#004faf\">All&nbsp;Classes</font></a>&nbsp;&middot;" \
-                          " <a href=\"mainclasses.html\">" \
-                          "<font color=\"#004faf\">Main&nbsp;Classes</font></a>&nbsp;&middot;" \
-                          " <a href=\"groups.html\">" \
-                          "<font color=\"#004faf\">Grouped&nbsp;Classes</font></a>&nbsp;&middot;" \
-                          " <a href=\"modules.html\">" \
-                          "<font color=\"#004faf\">Modules</font></a>&nbsp;&middot;" \
-                          " <a href=\"functions.html\">" \
-                          "<font color=\"#004faf\">Functions</font></a>" \
-                          "</td>\n" \
-                          "<td align=\"right\" valign=\"top\" width=\"230\"><a href=\"http://qt.nokia.com\"><img src=\"images/trolltech-logo.png\" align=\"right\" width=\"203\" height=\"32\" border=\"0\" /></a></td></tr></table>"
-
-HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
-                          "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
-                          "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
-                          "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
-                          "</tr></table></div></address>"
diff --git a/tools/qvfb/config.ui b/tools/qvfb/config.ui
index ad9c39eaaf..b74bef7bbc 100644
--- a/tools/qvfb/config.ui
+++ b/tools/qvfb/config.ui
@@ -47,7 +47,7 @@
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>665</height>
+    <height>690</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -118,6 +118,13 @@
          </widget>
         </item>
         <item>
+         <widget class="QRadioButton" name="size_800_480">
+          <property name="text">
+           <string>800x480</string>
+          </property>
+         </widget>
+        </item>
+        <item>
          <widget class="QRadioButton" name="size_800_600">
           <property name="text">
            <string>800x600</string>
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index 59e8dae726..09692b7be9 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -669,6 +669,8 @@ void QVFb::configure()
 	    w=320; h=240;
 	} else if ( config->size_640_480->isChecked() ) {
 	    w=640; h=480;
+	} else if ( config->size_800_480->isChecked() ) {
+	    w=800; h=480;
 	} else if ( config->size_800_600->isChecked() ) {
 	    w=800; h=600;
 	} else if ( config->size_1024_768->isChecked() ) {
@@ -748,6 +750,7 @@ void QVFb::chooseSize(const QSize& sz)
     config->size_240_320->setChecked(sz == QSize(240,320));
     config->size_320_240->setChecked(sz == QSize(320,240));
     config->size_640_480->setChecked(sz == QSize(640,480));
+    config->size_800_480->setChecked(sz == QSize(800,480));
     config->size_800_600->setChecked(sz == QSize(800,600));
     config->size_1024_768->setChecked(sz == QSize(1024,768));
 }