Merge branch '4.6'

Conflicts:
	src/gui/styles/qcommonstyle.cpp
	tools/assistant/lib/lib.pro
	tools/assistant/lib/qhelp_global.cpp
	tools/assistant/tools/assistant/assistant.qch
	tools/assistant/tools/assistant/mainwindow.cpp

2 files changed, 11 insertions, 11 deletions

diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp
index 475f07d..feabaed 100644
--- a/tests/arthur/common/paintcommands.cpp
+++ b/tests/arthur/common/paintcommands.cpp
@@ -587,10 +587,10 @@ void PaintCommands::staticInit()
                       "^image_setColor\\s+([\\w.:\\/]*)\\s+([0-9]*)\\s+#([0-9]*)$",
                       "image_setColor <imageName> <index> <color>",
                       "image_setColor myImage 0 black");
-    DECL_PAINTCOMMAND("image_setNumColors", command_image_setNumColors,
-                      "^image_setNumColors\\s+([\\w.:\\/]*)\\s+([0-9]*)$",
-                      "image_setNumColors <imageName> <nbColors>",
-                      "image_setNumColors myImage 128");
+    DECL_PAINTCOMMAND("image_setColorCount", command_image_setColorCount,
+                      "^image_setColorCount\\s+([\\w.:\\/]*)\\s+([0-9]*)$",
+                      "image_setColorCount <imageName> <nbColors>",
+                      "image_setColorCount myImage 128");
 
     DECL_PAINTCOMMANDSECTION("transformations");
     DECL_PAINTCOMMAND("resetMatrix", command_resetMatrix,
@@ -974,7 +974,7 @@ void PaintCommands::command_drawPixmap(QRegExp re)
     if (sh == 0) sh = -1;
 
     if (m_verboseMode)
-        printf(" -(lance) drawPixmap('%s' dim=(%d, %d), depth=%d, (%d, %d, %d, %d), (%d, %d, %d, %d)\n",
+        printf(" -(lance) drawPixmap('%s' dim=(%d, %d), depth=%d, (%f, %f, %f, %f), (%f, %f, %f, %f)\n",
                qPrintable(re.cap(1)), pm.width(), pm.height(), pm.depth(),
                tx, ty, tw, th, sx, sy, sw, sh);
 
@@ -1022,7 +1022,7 @@ void PaintCommands::command_drawImage(QRegExp re)
     if (sh == 0) sh = -1;
 
     if (m_verboseMode)
-        printf(" -(lance) drawImage('%s' dim=(%d, %d), (%d, %d, %d, %d), (%d, %d, %d, %d)\n",
+        printf(" -(lance) drawImage('%s' dim=(%d, %d), (%f, %f, %f, %f), (%f, %f, %f, %f)\n",
                qPrintable(re.cap(1)), im.width(), im.height(), tx, ty, tw, th, sx, sy, sw, sh);
 
     m_painter->drawImage(QRectF(tx, ty, tw, th), im, QRectF(sx, sy, sw, sh), Qt::OrderedDither | Qt::OrderedAlphaDither);
@@ -2245,7 +2245,7 @@ void PaintCommands::command_image_load(QRegExp re)
 }
 
 /***************************************************************************************************/
-void PaintCommands::command_image_setNumColors(QRegExp re)
+void PaintCommands::command_image_setColorCount(QRegExp re)
 {
     QStringList caps = re.capturedTexts();
 
@@ -2253,10 +2253,10 @@ void PaintCommands::command_image_setNumColors(QRegExp re)
     int count = convertToInt(caps.at(2));
 
     if (m_verboseMode)
-        printf(" -(lance) image_setNumColors(%s), %d -> %d\n",
-               qPrintable(name), m_imageMap[name].numColors(), count);
+        printf(" -(lance) image_setColorCount(%s), %d -> %d\n",
+               qPrintable(name), m_imageMap[name].colorCount(), count);
 
-    m_imageMap[name].setNumColors(count);
+    m_imageMap[name].setColorCount(count);
 }
 
 /***************************************************************************************************/
diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h
index ba91a92..e2c4d67 100644
--- a/tests/arthur/common/paintcommands.h
+++ b/tests/arthur/common/paintcommands.h
@@ -239,7 +239,7 @@ private:
     void command_image_convertToFormat(QRegExp re);
     void command_image_load(QRegExp re);
     void command_image_setColor(QRegExp re);
-    void command_image_setNumColors(QRegExp re);
+    void command_image_setColorCount(QRegExp re);
 
     // commands: transformation
     void command_resetMatrix(QRegExp re);