qtbindings 4.6.3.1-x86-mingw32 → 4.6.3.2-x86-mingw32

data/ext/generator/parser/tokens.cpp

@@ -99,6 +99,7 @@ static char const * const _S_token_names[] = {
   "signals",
   "signed",
   "sizeof",
+  "size_t",
   "slots",
   "static",
   "static_cast",
@@ -204,6 +205,7 @@ static char const * const _S_token_texts[] = {
   "signals",
   "signed",
   "sizeof",
+  "size_t",
   "slots",
   "static",
   "static_cast",
@@ -328,6 +330,7 @@ static char _S_printable[][2] = {
   { char(125), '\0' },
   { char(126), '\0' },
   { char(127), '\0' },
+  { char(128), '\0' },
 };
 
 char const *token_name(int token)

data/ext/generator/parser/tokens.h

@@ -107,6 +107,7 @@ enum TOKEN_KIND
     Token_signals,
     Token_signed,
     Token_sizeof,
+    Token_size_t,
     Token_slots,
     Token_static,
     Token_static_cast,

data/ext/generator/type_compiler.cpp

@@ -182,7 +182,7 @@ void TypeCompiler::visitParameterDeclaration(ParameterDeclarationAST* node)
     TypeCompiler tc(m_session, m_visitor);
     tc.run(node->type_specifier, node->declarator);
     NameCompiler name_cc(m_session, m_visitor);
-    if (tc.type().isFunctionPointer())
+    if (tc.type().isFunctionPointer() && node->declarator && node->declarator->sub_declarator)
         name_cc.run(node->declarator->sub_declarator->id);
     else if (node->declarator)
         name_cc.run(node->declarator->id);

data/ext/ruby/qtruby/src/handlers.cpp

@@ -362,8 +362,11 @@ smokeruby_mark(void * p)
 		if (qstrcmp(className, "QModelIndex") == 0) {
 			QModelIndex * qmodelindex = (QModelIndex *) o->ptr;
 			void * ptr = qmodelindex->internalPointer();
-			if (ptr != 0 && ptr != (void *) Qnil) {
-				rb_gc_mark((VALUE) ptr);
+		        obj = getPointerObject(ptr);
+			if (obj != Qnil) {
+				if (do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p", "QModelIndex", ptr, (void*)obj);
+                                 
+				rb_gc_mark(obj);
 			}
 
 			return;
@@ -1008,7 +1011,7 @@ qstringFromRString(VALUE rstring) {
 	encoding = rb_funcall(encoding, rb_intern("to_s"), 0);
 	const char * enc_s = RSTRING_PTR(encoding);
 
-	if (qstrcmp(enc_s, "UTF8") == 0) {
+	if (qstrcmp(enc_s, "UTF-8") == 0) {
 		return new QString(QString::fromUtf8(StringValuePtr(rstring), RSTRING_LEN(rstring)));
 	} else if (qstrcmp(enc_s, "EUC-JP") == 0) {
 		codec = QTextCodec::codecForName("eucJP");
@@ -2565,6 +2568,7 @@ Q_DECL_EXPORT TypeHandler Qt_handlers[] = {
     { "HPALETTE__*", marshall_voidP },
     { "HRGN__*", marshall_voidP },
     { "HWND__*", marshall_voidP },
+    { "QFlags&", marshall_it<int *> },
 #if QT_VERSION >= 0x40200
     { "QList<QGraphicsItem*>", marshall_QGraphicsItemList },
     { "QList<QGraphicsItem*>&", marshall_QGraphicsItemList },
@@ -2613,6 +2617,12 @@ Marshall::HandlerFn getMarshallFn(const SmokeType &type) {
 	if (h == 0 && type.isConst() && strlen(type.name()) > strlen("const ")) {
 		h = type_handlers[type.name() + strlen("const ")];
 	}
+
+        char last_char = type.name()[strlen(type.name()) - 1];
+        if (h == 0 && strncmp(type.name(), "QFlags", 6) == 0 && last_char == '&')
+        {
+          h = type_handlers["QFlags&"];
+        }
 	
 	if (h != 0) {
 		return h->fn;

data/ext/smoke/CMakeLists.txt

@@ -21,6 +21,7 @@ macro_optional_add_bindings(QT_QTSCRIPT_FOUND "QtScript" qtscript)
 macro_optional_add_bindings(QT_QTUITOOLS_FOUND "QtUiTools" qtuitools)
 macro_optional_add_bindings(QT_QTTEST_FOUND "QtTest" qttest)
 macro_optional_add_bindings(QT_QTMULTIMEDIA_FOUND "QtMultimedia" qtmultimedia)
+macro_optional_add_bindings(QT_QTHELP_FOUND "QtHelp" qthelp)
 
 # for qtguess.pl
 if (APPLE)

data/ext/smoke/qtcore/smokeconfig.xml

@@ -14,6 +14,8 @@
         <signature>.*::d_ptr.*</signature>
         <signature>.*::q_ptr.*</signature>
         <signature>.*QUuid::data.*</signature>
+        <signature>.*QBitArray::data_ptr.*</signature>
+        <signature>.*QByteArray::data_ptr.*</signature>
         <signature>.*\(.*Private.*\).*</signature>
         <signature>.*QLocale::p</signature>
         <signature>.*QLocale::v</signature>

data/ext/smoke/qtdeclarative/smokeconfig.xml

@@ -27,6 +27,7 @@
         <signature>.*qmlRegisterTypeNotAvailable.*</signature>
         <!-- windows internal helper functions -->
         <signature>.*qFrom.*Endian_helper.*</signature>
+        <signature>.*qt_mac_set_cursor.*</signature>
    </exclude>
     <functions>
         <!-- include functions starting with 'q' -->

data/ext/smoke/qthelp/CMakeLists.txt

@@ -0,0 +1,45 @@
+
+include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke )
+
+configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY)
+
+########### next target ###############
+
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp 
+    ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp 
+
+    COMMAND smokegen
+    ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+         -- ${CMAKE_CURRENT_SOURCE_DIR}/qthelp_includes.h
+    DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
+
+include_directories (${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qthelp  )
+
+set(smokeqthelp_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp  
+                ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp 
+)
+
+IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
+    ADD_DEFINITIONS(-DGCC_VISIBILITY)
+ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
+
+# kde4_add_library(smokeqthelp SHARED ${smokeqthelp_LIB_SRCS})
+add_library(smokeqthelp SHARED ${smokeqthelp_LIB_SRCS})
+
+target_link_libraries(smokeqthelp 
+                        smokeqtcore 
+                        smokeqtgui 
+                        smokeqtsql
+                        ${QT_QTCORE_LIBRARY} 
+                        ${QT_QTGUI_LIBRARY} 
+                        ${QT_QTSQL_LIBRARY} 
+                        ${QT_QTHELP_LIBRARY} )
+
+set_target_properties(smokeqthelp PROPERTIES VERSION 3.0.0 SOVERSION 3 )
+
+# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
+# for Qt only installs
+install(TARGETS smokeqthelp DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/qthelp_smoke.h DESTINATION include/smoke)

data/ext/smoke/qthelp/config.xml.cmake

@@ -0,0 +1,13 @@
+<config>
+    <resolveTypedefs>true</resolveTypedefs>
+    <qtMode>true</qtMode>
+    <generator>smoke</generator>
+    <definesList>@CMAKE_BINARY_DIR@/smoke/qtdefines</definesList>
+    <includeDirs>
+        <dir>@QT_INCLUDE_DIR@</dir>
+        <dir>@QT_QTCORE_INCLUDE_DIR@</dir>
+        <dir>@QT_QTGUI_INCLUDE_DIR@</dir>
+        <dir>@QT_QTSQL_INCLUDE_DIR@</dir>
+        <dir>@QT_QTHELP_INCLUDE_DIR@</dir>
+    </includeDirs>
+</config>

data/ext/smoke/qthelp/qthelp_includes.h

@@ -0,0 +1,3 @@
+#include <QtCore>
+#include <QtSql>
+#include <QtHelp>

data/ext/smoke/qthelp/smokeconfig.xml

@@ -0,0 +1,53 @@
+<config>
+    <moduleName>qthelp</moduleName>
+    <parentModules>
+        <module>qtcore</module>
+        <module>qtgui</module>
+        <module>qtsql</module>
+    </parentModules>
+    <parts>1</parts>
+    <scalarTypes>
+        <!-- QString is a class, but represented as a scalar (#) in munged names -->
+        <typeName>QString</typeName>
+    </scalarTypes>
+    <voidpTypes>
+        <!-- both are classes, but they are represented as Smoke::t_voidp -->
+        <typeName>QStringList</typeName>
+        <typeName>QString</typeName>
+    </voidpTypes>
+    <exclude>
+        <!-- we don't want private stuff in smoke.. -->
+        <signature>.*::d</signature>
+        <signature>.*::d_ptr</signature>
+        <signature>.*::q_ptr</signature>
+        <signature>.*\(.*Private.*\).*</signature>
+        <!-- Thread related stuff belongs to the bindings language -->
+        <signature>.*QtConcurrent.*</signature>
+        <signature>.*QDomNode.*</signature>
+        <!-- this doesn't link, internal stuff.. -->
+        <signature>.*qFindString.*</signature>
+        <!-- windows internal helper functions -->
+        <signature>.*qFrom.*Endian_helper.*</signature>
+        <signature>.*qt_mac_set_cursor.*</signature>
+   </exclude>
+    <functions>
+        <!-- include functions starting with 'q' -->
+        <name>^q.*</name>
+        <name>.*::q.*</name>
+        <!-- and operators -->
+        <name>.*operator.*</name>
+    </functions>
+    <classList>
+        <class>QHelpContentItem</class>
+        <class>QHelpContentModel</class>
+        <class>QHelpContentWidget</class>
+        <class>QHelpEngine</class>
+        <class>QHelpEngineCore</class>
+        <class>QHelpIndexModel</class>
+        <class>QHelpIndexWidget</class>
+        <class>QHelpSearchEngine</class>
+        <class>QHelpSearchQuery</class>
+        <class>QHelpSearchQueryWidget</class>
+        <class>QHelpSearchResultWidget</class>
+     </classList>
+</config>

data/ext/smoke/qthelp_smoke.h

@@ -0,0 +1,16 @@
+#ifndef QTHELP_SMOKE_H
+#define QTHELP_SMOKE_H
+
+#include <smoke.h>
+
+// Defined in smokedata.cpp, initialized by init_qthelp_Smoke(), used by all .cpp files
+extern "C" SMOKE_EXPORT Smoke* qthelp_Smoke;
+extern "C" SMOKE_EXPORT void init_qthelp_Smoke();
+extern "C" SMOKE_EXPORT void delete_qthelp_Smoke();
+
+#ifndef QGLOBALSPACE_CLASS
+#define QGLOBALSPACE_CLASS
+class QGlobalSpace { };
+#endif
+
+#endif

data/ext/smoke/qtopengl/config.xml.cmake

@@ -8,5 +8,6 @@
         <dir>@QT_QTCORE_INCLUDE_DIR@</dir>
         <dir>@QT_QTGUI_INCLUDE_DIR@</dir>
         <dir>@QT_QTOPENGL_INCLUDE_DIR@</dir>
+        <dir>@OPENGL_INCLUDE_DIR@</dir>
     </includeDirs>
 </config>

data/ext/smoke/qtxmlpatterns/smokeconfig.xml

@@ -33,7 +33,7 @@
         <signature>.*QXmlNodeModelIndex::documentUri.*</signature>
         <signature>.*QXmlNodeModelIndex::root.*</signature>
         <signature>.*QXmlNodeModelIndex::name.*</signature>
-        <signature>.*QXmlNodeModelIndex::is.*</signature>
+        <signature>.*QXmlNodeModelIndex::is\(.*</signature>
         <signature>.*QXmlNodeModelIndex::stringValue.*</signature>
         <signature>.*QXmlNodeModelIndex::namespaceForPrefix.*</signature>         
         <signature>.*QXmlName::QXmlName.*short.*</signature>

data/extconf.rb

@@ -106,30 +106,31 @@ File.open('Makefile', 'w') do |file|
     file.puts "\tcd ext\\build && mingw32-make"
     file.puts ""
     file.puts "install: makedirs"
-    file.puts "\tcopy ext\\build\\smoke\\deptool\\smokedeptool.exe bin\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtcore\\libsmokeqtcore.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtgui\\libsmokeqtgui.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtmultimedia\\libsmokeqtmultimedia.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtnetwork\\libsmokeqtnetwork.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtopengl\\libsmokeqtopengl.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtscript\\libsmokeqtscript.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtsql\\libsmokeqtsql.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtsvg\\libsmokeqtsvg.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qttest\\libsmokeqttest.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtuitools\\libsmokeqtuitools.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtwebkit\\libsmokeqtwebkit.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtxml\\libsmokeqtxml.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\qtxmlpatterns\\libsmokeqtxmlpatterns.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\smokeapi\\smokeapi.exe bin\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\smoke\\smokebase\\libsmokebase.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\ruby\\qtruby\\src\\libqtruby4shared.dll lib\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\ruby\\qtruby\\src\\qtruby4.dll lib\\#{ruby_version}\\qtruby4.so"
-    file.puts "\tcopy ext\\build\\ruby\\qtscript\\qtscript.dll lib\\#{ruby_version}\\qtscript.so"
-    file.puts "\tcopy ext\\build\\ruby\\qttest\\qttest.dll lib\\#{ruby_version}\\qttest.so"
-    file.puts "\tcopy ext\\build\\ruby\\qtuitools\\qtuitools.dll lib\\#{ruby_version}\\qtuitools.so"
-    file.puts "\tcopy ext\\build\\ruby\\qtwebkit\\qtwebkit.dll lib\\#{ruby_version}\\qtwebkit.so"
-    file.puts "\tcopy ext\\build\\ruby\\qtruby\\tools\\rbrcc\\rbrcc.exe bin\\#{ruby_version}"
-    file.puts "\tcopy ext\\build\\ruby\\qtruby\\tools\\rbuic\\rbuic4.exe bin\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\deptool\\smokedeptool.exe bin\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtcore\\libsmokeqtcore.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtgui\\libsmokeqtgui.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qthelp\\libsmokeqthelp.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtmultimedia\\libsmokeqtmultimedia.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtnetwork\\libsmokeqtnetwork.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtopengl\\libsmokeqtopengl.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtscript\\libsmokeqtscript.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtsql\\libsmokeqtsql.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtsvg\\libsmokeqtsvg.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qttest\\libsmokeqttest.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtuitools\\libsmokeqtuitools.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtwebkit\\libsmokeqtwebkit.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtxml\\libsmokeqtxml.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtxmlpatterns\\libsmokeqtxmlpatterns.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\smokeapi\\smokeapi.exe bin\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\smokebase\\libsmokebase.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\ruby\\qtruby\\src\\libqtruby4shared.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\ruby\\qtruby\\src\\qtruby4.dll lib\\#{ruby_version}\\qtruby4.so"
+    file.puts "\t-copy ext\\build\\ruby\\qtscript\\qtscript.dll lib\\#{ruby_version}\\qtscript.so"
+    file.puts "\t-copy ext\\build\\ruby\\qttest\\qttest.dll lib\\#{ruby_version}\\qttest.so"
+    file.puts "\t-copy ext\\build\\ruby\\qtuitools\\qtuitools.dll lib\\#{ruby_version}\\qtuitools.so"
+    file.puts "\t-copy ext\\build\\ruby\\qtwebkit\\qtwebkit.dll lib\\#{ruby_version}\\qtwebkit.so"
+    file.puts "\t-copy ext\\build\\ruby\\qtruby\\tools\\rbrcc\\rbrcc.exe bin\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\ruby\\qtruby\\tools\\rbuic\\rbuic4.exe bin\\#{ruby_version}"
     file.puts ""
     file.puts "installqt: makedirs"
     file.puts "\tcopy #{qt_sdk_path}\\qt\\bin\\*.dll bin"
@@ -237,41 +238,42 @@ File.open('Makefile', 'w') do |file|
     file.puts ""    
     file.puts "install: makedirs"
     if macosx
-      file.puts "\tcp ext/build/smoke/smokeapi/smokeapi bin/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/deptool/smokedeptool bin/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qtruby/src/qtruby4.so lib/#{ruby_version}/qtruby4.bundle"
-      file.puts "\tcp ext/build/ruby/qtscript/qtscript.* lib/#{ruby_version}/qtscript.bundle"
-      file.puts "\tcp ext/build/ruby/qttest/qttest.* lib/#{ruby_version}/qttest.bundle"
-      file.puts "\tcp ext/build/ruby/qtuitools/qtuitools.* lib/#{ruby_version}/qtuitools.bundle"
-      file.puts "\tcp ext/build/ruby/qtwebkit/qtwebkit.* lib/#{ruby_version}/qtwebkit.bundle"
-      file.puts "\tcp ext/build/ruby/qtruby/tools/rbrcc/rbrcc bin/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qtruby/tools/rbuic/rbuic4 bin/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/smokeapi/smokeapi bin/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/deptool/smokedeptool bin/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtruby/src/qtruby4.so lib/#{ruby_version}/qtruby4.bundle"
+      file.puts "\t-cp ext/build/ruby/qtscript/qtscript.* lib/#{ruby_version}/qtscript.bundle"
+      file.puts "\t-cp ext/build/ruby/qttest/qttest.* lib/#{ruby_version}/qttest.bundle"
+      file.puts "\t-cp ext/build/ruby/qtuitools/qtuitools.* lib/#{ruby_version}/qtuitools.bundle"
+      file.puts "\t-cp ext/build/ruby/qtwebkit/qtwebkit.* lib/#{ruby_version}/qtwebkit.bundle"
+      file.puts "\t-cp ext/build/ruby/qtruby/tools/rbrcc/rbrcc bin/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtruby/tools/rbuic/rbuic4 bin/#{ruby_version}"
     else
-      file.puts "\tcp ext/build/smoke/deptool/smokedeptool bin/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtcore/libsmokeqtcore.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtdbus/libsmokeqtdbus.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtgui/libsmokeqtgui.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtmultimedia/libsmokeqtmultimedia.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtnetwork/libsmokeqtnetwork.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtopengl/libsmokeqtopengl.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtscript/libsmokeqtscript.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtsql/libsmokeqtsql.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtsvg/libsmokeqtsvg.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qttest/libsmokeqttest.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtuitools/libsmokeqtuitools.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtwebkit/libsmokeqtwebkit.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtxml/libsmokeqtxml.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/qtxmlpatterns/libsmokeqtxmlpatterns.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/smokeapi/smokeapi bin/#{ruby_version}"
-      file.puts "\tcp ext/build/smoke/smokebase/libsmokebase.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qtruby/src/libqtruby4shared.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qtruby/src/qtruby4.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qtscript/qtscript.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qttest/qttest.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qtuitools/qtuitools.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qtwebkit/qtwebkit.* lib/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qtruby/tools/rbrcc/rbrcc bin/#{ruby_version}"
-      file.puts "\tcp ext/build/ruby/qtruby/tools/rbuic/rbuic4 bin/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/deptool/smokedeptool bin/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtcore/libsmokeqtcore.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtdbus/libsmokeqtdbus.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtgui/libsmokeqtgui.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qthelp/libsmokeqthelp.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtmultimedia/libsmokeqtmultimedia.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtnetwork/libsmokeqtnetwork.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtopengl/libsmokeqtopengl.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtscript/libsmokeqtscript.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtsql/libsmokeqtsql.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtsvg/libsmokeqtsvg.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qttest/libsmokeqttest.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtuitools/libsmokeqtuitools.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtwebkit/libsmokeqtwebkit.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtxml/libsmokeqtxml.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtxmlpatterns/libsmokeqtxmlpatterns.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/smokeapi/smokeapi bin/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/smokebase/libsmokebase.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtruby/src/libqtruby4shared.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtruby/src/qtruby4.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtscript/qtscript.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qttest/qttest.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtuitools/qtuitools.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtwebkit/qtwebkit.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtruby/tools/rbrcc/rbrcc bin/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtruby/tools/rbuic/rbuic4 bin/#{ruby_version}"
     end
   end
 end

data/lib/Qt/qtruby4.rb

@@ -2533,14 +2533,13 @@ module Qt
     end
 
     def Internal.checkarg(argtype, typename)
-      puts "      #{typename} (#{argtype})" if debug_level >= DebugLevel::High
       const_point = typename =~ /^const\s+/ ? -1 : 0
       if argtype == 'i'
         if typename =~ /^int&?$|^signed int&?$|^signed$|^qint32&?$/
           return 6 + const_point
         elsif typename =~ /^quint32&?$/
           return 4 + const_point         
-        elsif typename =~ /^(?:short|ushort|unsigned short int|unsigned short|uchar||unsigned char|uint|long|ulong|unsigned long int|unsigned|float|double|WId|HBITMAP__\*|HDC__\*|HFONT__\*|HICON__\*|HINSTANCE__\*|HPALETTE__\*|HRGN__\*|HWND__\*|Q_PID|^quint16&?$|^qint16&?$)$/
+        elsif typename =~ /^(?:short|ushort|unsigned short int|unsigned short|uchar|char|unsigned char|uint|long|ulong|unsigned long int|unsigned|float|double|WId|HBITMAP__\*|HDC__\*|HFONT__\*|HICON__\*|HINSTANCE__\*|HPALETTE__\*|HRGN__\*|HWND__\*|Q_PID|^quint16&?$|^qint16&?$)$/
           return 4 + const_point
         elsif typename =~ /^(quint|qint|qulong|qlong|qreal)/
           return 4 + const_point
@@ -2741,11 +2740,9 @@ module Qt
 
       # Debugging output for method lookup
       if debug_level >= DebugLevel::High
-        puts "classname    == #{classname}"
-        puts ":: method == #{method}"
+        puts "Searching for #{classname}##{method}"
         puts "Munged method names:"
-        methods.each {|meth| puts "  #{meth}"}
-        puts "-> methodIds == #{methodIds.inspect}"
+        methods.each {|meth| puts "        #{meth}"}
         puts "candidate list:"
         prototypes = dumpCandidates(methodIds).split("\n")
         line_len = (prototypes.collect { |p| p.length }).max
@@ -2764,24 +2761,24 @@ module Qt
           current_match = (isConstMethod(id) ? 1 : 0)
           (0...args.length).each do
             |i|
-            current_match += checkarg(get_value_type(args[i]), get_arg_type_name(id, i))
+            typename = get_arg_type_name(id, i)
+            argtype = get_value_type(args[i])
+            score = checkarg(argtype, typename)
+            current_match += score
+            puts "        #{typename} (#{argtype}) score: #{score}" if debug_level >= DebugLevel::High
           end
           
           # Note that if current_match > best_match, then chosen must be nil
           if current_match > best_match
             best_match = current_match
             chosen = id
-          # Multiple matches are an error; the equality test below _cannot_ be commented out.
-          # If ambiguous matches occur the problem must be fixed be adjusting the relative
-          # ranking of the arg types involved in checkarg().
+          # Ties are bad - but it is better to chose something than to fail
           elsif current_match == best_match && id.smoke == chosen.smoke
-            puts "multiple methods matching, this is an error" if debug_level >= DebugLevel::Minimal
-            chosen = nil
+            puts " ****** warning: multiple methods with the same score of #{current_match}: #{chosen.index} and #{id.index}" if debug_level >= DebugLevel::Minimal
+            chosen = id
           end
-          puts "match => #{id.index} score: #{current_match} chosen: #{chosen}" if debug_level >= DebugLevel::High
+          puts "        match => smoke: #{id.smoke} index: #{id.index} score: #{current_match} chosen: #{chosen ? chosen.index : nil}" if debug_level >= DebugLevel::High
         end
-          
-        puts "Resolved to id: #{chosen.index}" if !chosen.nil? && debug_level >= DebugLevel::High
       end
 
       # Additional debugging output

data/lib/qtbindings_version.rb

@@ -1,2 +1,2 @@
-QTBINDINGS_VERSION = '4.6.3.1'
-QTBINDINGS_RELEASE_DATE = 'Tue Oct 12 20:01:02 -0600 2010'
+QTBINDINGS_VERSION = '4.6.3.2'
+QTBINDINGS_RELEASE_DATE = '2010-12-05 23:33:05 -0700'