qtbindings 4.6.3.0-x86-mingw32 → 4.6.3.1-x86-mingw32

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

@@ -526,6 +526,7 @@ findMethod(VALUE /*self*/, VALUE c_value, VALUE name_value)
     VALUE result = rb_ary_new();
     Smoke::ModuleIndex classId = Smoke::findClass(c);    
     Smoke::ModuleIndex meth = Smoke::NullModuleIndex;
+    QList<Smoke::ModuleIndex> milist;
     if (classId.smoke != 0) {
         meth = classId.smoke->findMethod(c, name);
     }
@@ -540,39 +541,47 @@ findMethod(VALUE /*self*/, VALUE c_value, VALUE name_value)
             Smoke::ModuleIndex mnid = s->idMethodName(name);
             if (!cid.index || !mnid.index) continue;
             meth = s->idMethod(cid.index, mnid.index);
-            if (meth.index) break;
+            if (meth.index) milist.append(meth);
         }
 #ifdef DEBUG
         if (do_debug & qtdb_calls) qWarning("Found method QGlobalSpace::%s => %d", name, meth.index);
 #endif
     }
+    else
+    {
+        milist.append(meth);
+    }
 
-    if (meth.index == 0) {
+    if (milist.count() == 0) {
         return result;
     // empty list
-    } else if (meth.index > 0) {
-        Smoke::Index i = meth.smoke->methodMaps[meth.index].method;
-        if (i == 0) {		// shouldn't happen
-            rb_raise(rb_eArgError, "Corrupt method %s::%s", c, name);
-        } else if(i > 0) {	// single match
-            const Smoke::Method &methodRef = meth.smoke->methods[i];
-            if ((methodRef.flags & Smoke::mf_internal) == 0) {
-                rb_ary_push(result, rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(meth.smoke)), INT2NUM(i)));
-            }
-        } else {		// multiple match
-            i = -i;		// turn into ambiguousMethodList index
-            while (meth.smoke->ambiguousMethodList[i]) {
-                const Smoke::Method &methodRef = meth.smoke->methods[meth.smoke->ambiguousMethodList[i]];
-                if ((methodRef.flags & Smoke::mf_internal) == 0) {
-                    rb_ary_push(result, rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(meth.smoke)), INT2NUM(meth.smoke->ambiguousMethodList[i])));
+    } else {
+        foreach (Smoke::ModuleIndex meth, milist) { 
+            if (meth.index > 0) {
+                Smoke::Index i = meth.smoke->methodMaps[meth.index].method;
+                if (i == 0) {		// shouldn't happen
+                    rb_raise(rb_eArgError, "Corrupt method %s::%s", c, name);
+                } else if(i > 0) {	// single match
+                    const Smoke::Method &methodRef = meth.smoke->methods[i];
+                    if ((methodRef.flags & Smoke::mf_internal) == 0) {
+                        rb_ary_push(result, rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(meth.smoke)), INT2NUM(i)));
+                    }
+                } else {		// multiple match
+                    i = -i;		// turn into ambiguousMethodList index
+                    while (meth.smoke->ambiguousMethodList[i]) {
+                        const Smoke::Method &methodRef = meth.smoke->methods[meth.smoke->ambiguousMethodList[i]];
+                        if ((methodRef.flags & Smoke::mf_internal) == 0) {
+                            rb_ary_push(result, rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(meth.smoke)), INT2NUM(meth.smoke->ambiguousMethodList[i])));
 //#ifdef DEBUG
-                    if (do_debug & qtdb_calls) qWarning("Ambiguous Method %s::%s => %d", c, name, meth.smoke->ambiguousMethodList[i]);
+                            if (do_debug & qtdb_calls) qWarning("Ambiguous Method %s::%s => %d", c, name, meth.smoke->ambiguousMethodList[i]);
 //#endif
 
-                }
-            i++;
+                        }
+                        i++;
+                    }
+	        }
             }
-	    }
+        }
     }
     return result;
 }

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

@@ -1139,9 +1139,11 @@ qvariant_from_value(int argc, VALUE * argv, VALUE self)
 {
 	if (argc == 2) {
 		Smoke::ModuleIndex nameId = Smoke::NullModuleIndex;
+		const char *typeName = StringValuePtr(argv[1]);
+		
 		if (TYPE(argv[0]) == T_DATA) {
 			nameId = qtcore_Smoke->idMethodName("QVariant#");
-		} else if (TYPE(argv[0]) == T_ARRAY || TYPE(argv[0]) == T_ARRAY) {
+		} else if (TYPE(argv[0]) == T_ARRAY || qstrcmp(typeName, "long long") == 0 || qstrcmp(typeName, "unsigned long long") == 0) {
 			nameId = qtcore_Smoke->idMethodName("QVariant?");
 		} else {
 			nameId = qtcore_Smoke->idMethodName("QVariant$");
@@ -1152,7 +1154,7 @@ qvariant_from_value(int argc, VALUE * argv, VALUE self)
 		i = -i;		// turn into ambiguousMethodList index
 		while (meth.smoke->ambiguousMethodList[i] != 0) {
 			if (	qstrcmp(	meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args]].name,
-								StringValuePtr(argv[1]) ) == 0 )
+								typeName ) == 0 )
 			{
 				_current_method.smoke = meth.smoke;
 				_current_method.index = meth.smoke->ambiguousMethodList[i];
@@ -1163,6 +1165,8 @@ qvariant_from_value(int argc, VALUE * argv, VALUE self)
 
 			i++;
 		}
+
+		if(do_debug & qtdb_gc) printf("No suitable method for signature QVariant::QVariant(%s) found - looking for another suitable constructor\n", StringValuePtr(argv[1]));
 	}
 
 	QVariant * v = 0;
@@ -2248,9 +2252,10 @@ create_qt_class(VALUE /*self*/, VALUE package_value, VALUE module_value)
 	VALUE klass = module_value;
 	QString packageName(package);
 
+/*
     rb_define_singleton_method(module_value, "method_missing", (VALUE (*) (...)) module_method_missing, -1);
     rb_define_singleton_method(module_value, "const_missing", (VALUE (*) (...)) module_method_missing, -1);
-
+*/
 	foreach(QString s, packageName.mid(strlen(moduleName) + 2).split("::")) {
 		klass = rb_define_class_under(klass, (const char*) s.toLatin1(), qt_base_class);
 	}

data/ext/smoke/CMakeLists.txt

@@ -9,6 +9,7 @@ add_subdirectory(smokeapi)
 
 macro_optional_add_bindings(QT_QTNETWORK_FOUND "QtNetwork" qtnetwork)
 macro_optional_add_bindings(QT_QTDBUS_FOUND "QtDBus" qtdbus)
+macro_optional_add_bindings(QT_QTDECLARATIVE_FOUND "QtDeclarative" qtdeclarative)
 macro_optional_add_bindings(QT_QTGUI_FOUND "QtGui" qtgui)
 macro_optional_add_bindings(QT_QTSVG_FOUND "QtSvg" qtsvg)
 macro_optional_add_bindings(QT_QTSQL_FOUND "QtSql" qtsql)

data/ext/smoke/qtcore/QtGuess.txt

@@ -95,6 +95,7 @@ QT_NO_XML)
 
 # macro is defined in qt-copy/src/qbase.pri but couldn't be found by qtguess, so I append it manually
 list(APPEND qtdefines "QT_NO_CAST_TO_ASCII")
+list(APPEND qtdefines "QT_GUI_LIB")
 
 # check for MSVC compiler
 if (MSVC)

data/ext/smoke/qtcore/smokeconfig.xml

@@ -77,6 +77,7 @@
         <class>QDirIterator</class>
         <class>QDynamicPropertyChangeEvent</class>
         <class>QEasingCurve</class>
+        <class>QElapsedTimer</class>
         <class>QEvent</class>
         <class>QEventLoop</class>
         <class>QEventTransition</class>

data/ext/smoke/qtdeclarative/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}/qtdeclarative_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/qtdeclarative  )
+
+set(smokeqtdeclarative_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(smokeqtdeclarative SHARED ${smokeqtdeclarative_LIB_SRCS})
+add_library(smokeqtdeclarative SHARED ${smokeqtdeclarative_LIB_SRCS})
+
+target_link_libraries(  smokeqtdeclarative 
+                        smokeqtcore 
+                        smokeqtgui 
+                        ${QT_QTCORE_LIBRARY} 
+                        ${QT_QTGUI_LIBRARY} 
+                        ${QT_QTNETWORK_LIBRARY} 
+                        ${QT_QTSCRIPT_LIBRARY} 
+                        ${QT_QTDECLARATIVE_LIBRARY} )
+
+set_target_properties(smokeqtdeclarative 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 smokeqtdeclarative DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/qtdeclarative_smoke.h DESTINATION include/smoke)

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

@@ -0,0 +1,12 @@
+<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_QTDECLARATIVE_INCLUDE_DIR@</dir>
+    </includeDirs>
+</config>

data/ext/smoke/qtdeclarative/qtdeclarative_includes.h

@@ -0,0 +1,3 @@
+#include <QtCore>
+#include <QtGui>
+#include <QtDeclarative>

data/ext/smoke/qtdeclarative/smokeconfig.xml

@@ -0,0 +1,58 @@
+<config>
+    <moduleName>qtdeclarative</moduleName>
+    <parentModules>
+        <module>qtcore</module>
+        <module>qtgui</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>
+        <!-- this doesn't link, internal stuff.. -->
+        <signature>.*qFindString.*</signature>
+        <signature>.*qmlRegisterTypeNotAvailable.*</signature>
+        <!-- windows internal helper functions -->
+        <signature>.*qFrom.*Endian_helper.*</signature>
+   </exclude>
+    <functions>
+        <!-- include functions starting with 'q' -->
+        <name>^q.*</name>
+        <name>.*::q.*</name>
+        <!-- and operators -->
+        <name>.*operator.*</name>
+    </functions>
+    <classList>
+        <class>QDeclarativeComponent</class>
+        <class>QDeclarativeContext</class>
+        <class>QDeclarativeEngine</class>
+        <class>QDeclarativeError</class>
+        <class>QDeclarativeExpression</class>
+        <class>QDeclarativeExtensionPlugin</class>
+        <class>QDeclarativeImageProvider</class>
+        <class>QDeclarativeItem</class>
+        <class>QDeclarativeListProperty</class>
+        <class>QDeclarativeListReference</class>
+        <class>QDeclarativeNetworkAccessManagerFactory</class>
+        <class>QDeclarativeParserStatus</class>
+        <class>QDeclarativeProperty</class>
+        <class>QDeclarativePropertyMap</class>
+        <class>QDeclarativeScriptString</class>
+        <class>QDeclarativeView</class>
+        
+        <!-- namespaces -->
+     </classList>
+</config>

data/ext/smoke/qtdeclarative_smoke.h

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

data/ext/smoke/qtnetwork/smokeconfig.xml

@@ -35,17 +35,17 @@
         <name>.*operator.*</name>
     </functions>
     <classList>
-        <class>QAbstractNetworkCache</class>                                                                                   
-        <class>QAbstractSocket</class>                                                                                         
-        <class>QAuthenticator</class>                                                                                          
-        <class>QFtp</class>                                                                                                    
-        <class>QHostAddress</class>                                                                                            
-        <class>QHostInfo</class>                                                                                               
-        <class>QHttp</class>                                                                                                   
-        <class>QHttpHeader</class>                                                                                             
-        <class>QHttpRequestHeader</class>                                                                                      
-        <class>QHttpResponseHeader</class>                                                                                     
-        <class>QIPv6Address</class>                                                                                            
+        <class>QAbstractNetworkCache</class>
+        <class>QAbstractSocket</class>
+        <class>QAuthenticator</class>
+        <class>QFtp</class>
+        <class>QHostAddress</class>
+        <class>QHostInfo</class>
+        <class>QHttp</class>
+        <class>QHttpHeader</class>
+        <class>QHttpRequestHeader</class>
+        <class>QHttpResponseHeader</class>
+        <class>QIPv6Address</class>
         <class>QLocalServer</class>
         <class>QLocalSocket</class>
         <class>QNetworkAccessManager</class>
@@ -53,6 +53,8 @@
         <class>QNetworkCacheMetaData</class>
         <class>QNetworkCookie</class>
         <class>QNetworkCookieJar</class>
+        <class>QNetworkConfiguration</class>
+        <class>QNetworkConfigurationManager</class>
         <class>QNetworkDiskCache</class>
         <class>QNetworkInterface</class>
         <class>QNetworkProxy</class>
@@ -60,6 +62,7 @@
         <class>QNetworkProxyQuery</class>
         <class>QNetworkReply</class>
         <class>QNetworkRequest</class>
+        <class>QNetworkSession</class>
         <class>QSslCertificate</class>
         <class>QSslCipher</class>
         <class>QSslConfiguration</class>

data/ext/smoke/qtopengl/smokeconfig.xml

@@ -39,6 +39,7 @@
     <classList>
         <class>QGLColormap</class>
         <class>QGLContext</class>
+        <class>QGLBuffer</class>
         <class>QGLFormat</class>
         <class>QGLFramebufferObject</class>
         <class>QGLFramebufferObjectFormat</class>

data/ext/smoke/qtsql/CMakeLists.txt

@@ -21,6 +21,8 @@ set(smokeqtsql_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
                 ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp 
 )
 
+ADD_DEFINITIONS(-DQT_GUI_LIB)
+
 IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
     ADD_DEFINITIONS(-DGCC_VISIBILITY)
 ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
@@ -30,7 +32,9 @@ add_library(smokeqtsql SHARED ${smokeqtsql_LIB_SRCS})
 
 target_link_libraries(smokeqtsql 
                         smokeqtcore 
+                        smokeqtgui 
                         ${QT_QTCORE_LIBRARY} 
+                        ${QT_QTGUI_LIBRARY} 
                         ${QT_QTSQL_LIBRARY} )
 
 set_target_properties(smokeqtsql PROPERTIES VERSION 3.0.0 SOVERSION 3 )

data/ext/smoke/qtsql/qtsql_includes.h

@@ -1,2 +1,3 @@
 #include <QtCore>
+#include <QtGui>
 #include <QtSql>

data/ext/smoke/qtsql/smokeconfig.xml

@@ -2,6 +2,7 @@
     <moduleName>qtsql</moduleName>
     <parentModules>
         <module>qtcore</module>
+        <module>qtgui</module>
     </parentModules>
     <parts>1</parts>
     <scalarTypes>
@@ -26,6 +27,7 @@
         <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' -->
@@ -47,6 +49,7 @@
         <class>QSqlQueryModel</class>
         <class>QSqlRecord</class>
         <class>QSqlRelation</class>
+        <class>QSqlRelationalDelegate</class>
         <class>QSqlRelationalTableModel</class>
         <class>QSqlResult</class>
         <class>QSqlTableModel</class>

data/extconf.rb

@@ -33,6 +33,14 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-mkdir bin\\1.8"
     file.puts "\t-mkdir bin\\1.9"
     file.puts "\t-mkdir bin\\plugins"
+    file.puts "\t-mkdir bin\\plugins\\accessible"
+    file.puts "\t-mkdir bin\\plugins\\codecs"
+    file.puts "\t-mkdir bin\\plugins\\designer"
+    file.puts "\t-mkdir bin\\plugins\\graphicssystems"
+    file.puts "\t-mkdir bin\\plugins\\iconengines"
+    file.puts "\t-mkdir bin\\plugins\\imageformats"
+    file.puts "\t-mkdir bin\\plugins\\phonon_backend"
+    file.puts "\t-mkdir bin\\plugins\\sqldrivers"
     file.puts "\t-mkdir lib\\1.8"
     file.puts "\t-mkdir lib\\1.9"
     file.puts ""    
@@ -48,6 +56,14 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-cd bin && del /F /Q *.so"
     file.puts "\t-cd bin && del /F /Q *.exe"
     file.puts "\t-cd bin\\plugins && del /F /Q *"
+    file.puts "\t-cd bin\\plugins\\accessible && del /F /Q *"
+    file.puts "\t-cd bin\\plugins\\codecs && del /F /Q *"
+    file.puts "\t-cd bin\\plugins\\designer && del /F /Q *"
+    file.puts "\t-cd bin\\plugins\\graphicssystems && del /F /Q *"
+    file.puts "\t-cd bin\\plugins\\iconengines && del /F /Q *"
+    file.puts "\t-cd bin\\plugins\\imageformats && del /F /Q *"
+    file.puts "\t-cd bin\\plugins\\phonon_backend && del /F /Q *"
+    file.puts "\t-cd bin\\plugins\\sqldrivers && del /F /Q *"
     file.puts "\t-cd bin\\1.8 && del /F /Q *"
     file.puts "\t-cd bin\\1.9 && del /F /Q *"
     file.puts "\t-cd lib\\1.8 && del /F /Q *"
@@ -118,15 +134,30 @@ File.open('Makefile', 'w') do |file|
     file.puts "installqt: makedirs"
     file.puts "\tcopy #{qt_sdk_path}\\qt\\bin\\*.dll bin"
     file.puts "\tdel /F /Q bin\\*d4.dll"
-    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\accessible\\*.dll bin\\plugins"
-    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\codecs\\*.dll bin\\plugins"
-    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\designer\\*.dll bin\\plugins"
-    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\graphicssystems\\*.dll bin\\plugins"
-    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\iconengines\\*.dll bin\\plugins"
-    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\imageformats\\*.dll bin\\plugins"
-    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\sqldrivers\\*.dll bin\\plugins"
-    file.puts "\tdel /F /Q bin\\plugins\\*d.dll"
-    file.puts "\tdel /F /Q bin\\plugins\\*d4.dll"
+    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\accessible\\*.dll bin\\plugins\\accessible"
+    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\codecs\\*.dll bin\\plugins\\codecs"
+    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\designer\\*.dll bin\\plugins\\designer"
+    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\graphicssystems\\*.dll bin\\plugins\\graphicssystems"
+    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\iconengines\\*.dll bin\\plugins\\iconengines"
+    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\imageformats\\*.dll bin\\plugins\\imageformats"
+    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\phonon_backend\\*.dll bin\\plugins\\phonon_backend"
+    file.puts "\tcopy #{qt_sdk_path}\\qt\\plugins\\sqldrivers\\*.dll bin\\plugins\\sqldrivers"
+    file.puts "\tdel /F /Q bin\\plugins\\accessible\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\accessible\\*d4.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\codecs\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\codecs\\*d4.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\designer\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\designer\\*d4.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\graphicssystems\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\graphicssystems\\*d4.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\iconengines\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\iconengines\\*d4.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\imageformats\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\imageformats\\*d4.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\phonon_backend\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\phonon_backend\\*d4.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\sqldrivers\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\sqldrivers\\*d4.dll"
   else
     file.puts "all: clean build"
     file.puts ""
@@ -135,6 +166,14 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-mkdir bin/1.8"
     file.puts "\t-mkdir bin/1.9"
     file.puts "\t-mkdir bin/plugins"
+    file.puts "\t-mkdir bin/plugins/accessible"
+    file.puts "\t-mkdir bin/plugins/codecs"
+    file.puts "\t-mkdir bin/plugins/designer"
+    file.puts "\t-mkdir bin/plugins/graphicssystems"
+    file.puts "\t-mkdir bin/plugins/iconengines"
+    file.puts "\t-mkdir bin/plugins/imageformats"
+    file.puts "\t-mkdir bin/plugins/phonon_backend"
+    file.puts "\t-mkdir bin/plugins/sqldrivers"
     file.puts "\t-mkdir lib/1.8"
     file.puts "\t-mkdir lib/1.9"    
     file.puts ""
@@ -149,14 +188,19 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-cd bin && rm *.dll"
     file.puts "\t-cd bin && rm *.so"
     file.puts "\t-cd bin && rm *.exe"
-    if ARGV[0] == '-d'
-      file.puts "-DCMAKE_BUILD_TYPE=Debug \\"
-    end   
-    file.puts "\t-cd bin\\plugins && rm *"
-    file.puts "\t-cd bin\\1.8 && rm *"
-    file.puts "\t-cd bin\\1.9 && rm *"
-    file.puts "\t-cd lib\\1.8 && rm *"
-    file.puts "\t-cd lib\\1.9 && rm *"    
+    file.puts "\t-cd bin/plugins && rm *"
+    file.puts "\t-cd bin/plugins/accessible && rm *"
+    file.puts "\t-cd bin/plugins/codecs && rm *"
+    file.puts "\t-cd bin/plugins/designer && rm *"
+    file.puts "\t-cd bin/plugins/graphicssystems && rm *"
+    file.puts "\t-cd bin/plugins/iconengines && rm *"
+    file.puts "\t-cd bin/plugins/imageformats && rm *"
+    file.puts "\t-cd bin/plugins/phonon_backend && rm *"
+    file.puts "\t-cd bin/plugins/sqldrivers && rm *"
+    file.puts "\t-cd bin/1.8 && rm *"
+    file.puts "\t-cd bin/1.9 && rm *"
+    file.puts "\t-cd lib/1.8 && rm *"
+    file.puts "\t-cd lib/1.9 && rm *"    
     file.puts "\t-rm Makefile"
     file.puts "\t-rm qtbindings-*.gem"
     file.puts ""
@@ -164,7 +208,9 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-cd ext/build; \\"
     file.puts "cmake \\"
     file.puts "-G \"Unix Makefiles\" \\"
-    
+    if ARGV[0] == '-d'
+      file.puts "-DCMAKE_BUILD_TYPE=Debug \\"
+    end   
     file.puts "-Wno-dev \\"
     file.puts "-DENABLE_SMOKE=on \\"
     file.puts "-DENABLE_QTCORE_SMOKE=on \\"