qtbindings 4.6.3.4 → 4.8.3.0

data/ext/ruby/qttest/qttesthandlers.cpp

@@ -21,6 +21,7 @@
 #undef connect
 #undef accept
 #undef truncate
+#undef rename
 
 #include <qtruby.h>
 #include <smokeruby.h>

data/ext/smoke/qtcore/QtGuess.txt

@@ -1,7 +1,9 @@
+# needs QTDEFINES_FILE set to work correctly.
+
 if(NOT QT_DEFINES_FOUND)
 #Threshold for tests
 set(QT_NO_DEBUG 16)
-set(QT_NO_ACCESSIBILITY 0)
+set(QT_NO_ACCESSIBILITY 16)
 set(QT_NO_ACTION 5)
 set(QT_NO_BUTTONGROUP 12)
 set(QT_NO_CHECKBOX 10)
@@ -95,6 +97,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_NO_CAST_FROM_ASCII")
 list(APPEND qtdefines "QT_GUI_LIB")
 
 # check for MSVC compiler
@@ -108,16 +111,10 @@ foreach(test_entry ${define_tests})
   endif(${${test_entry}} GREATER ${qt_test_threshold})
 endforeach(test_entry ${define_tests})
 
-if(WIN32)
-  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/../../src/corelib/global/qglobal.h" qglobal_h NEWLINE_CONSUME)
-  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/../../src/corelib/global/qconfig.h" qconfig_h NEWLINE_CONSUME)
-  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/../../src/corelib/global/qfeatures.h" qfeatures_h NEWLINE_CONSUME)
-else(WIN32)
-  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qglobal.h" qglobal_h NEWLINE_CONSUME)
-  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qconfig.h" qconfig_h NEWLINE_CONSUME)
-  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qfeatures.h" qfeatures_h NEWLINE_CONSUME)
-endif(WIN32)
-set(qtheaders "${qglobal_h}\n${qconfig_h}\n${qfeatures_h}")
+file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qglobal.h" qglobal_h NEWLINE_CONSUME)
+file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qconfig.h" qconfig_h NEWLINE_CONSUME)
+file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qfeatures.h" qfeatures_h NEWLINE_CONSUME)
+set(qtheaders "${qglobal_h}\n${qconfig_h}\n${qfeatures}")
 string(REGEX REPLACE "\n" ";" qtheaders "${qtheaders}")
 
 file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/qtdefines.cpp ${CMAKE_CURRENT_BINARY_DIR}/qtdefines)
@@ -139,11 +136,14 @@ if(${qtdefines_run} EQUAL 0)
   list(REMOVE_ITEM qtdefines_output "QT_DEBUG")
   # message(STATUS "Got defines from Qt headers ${qtdefines_output}")
   list(APPEND qtdefines ${qtdefines_output})
-  list(REMOVE_ITEM test_targets ${qtdefines_output})
+  if (qtdefines_output)
+    list(REMOVE_ITEM test_targets ${qtdefines_output})
+  endif (qtdefines_output)
 endif(${qtdefines_run} EQUAL 0)
 
 message(STATUS "Checking how Qt was built...")
 message(STATUS "Threshold is set to ${qt_test_threshold}")
+
 include (HandleImportedTargetsInCMakeRequiredLibraries)
 set(CMAKE_REQUIRED_INCLUDES ${CMAKE_SYSTEM_INCLUDE_PATH} ${QT_INCLUDE_DIR})
 set(CMAKE_REQUIRED_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY})
@@ -151,19 +151,12 @@ HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES(_CMAKE_REQUIRED_LIBRARIES)
 
 foreach(test_target ${test_targets})
   file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/test-${test_target})
-  if(QT_QTDBUS_FOUND)
-    try_compile(test_result "${CMAKE_CURRENT_BINARY_DIR}/test-${test_target}"
-      ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.cpp
-      COMPILE_DEFINITIONS -DTEST_${test_target}
-      CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_SYSTEM_INCLUDE_PATH};${QT_INCLUDE_DIR}"
-      "-DLINK_LIBRARIES:STRING=${QT_QTCORE_LIBRARY};${QT_QTDBUS_LIBRARY};${QT_QTGUI_LIBRARY};${QT_QTNETWORK_LIBRARY};${QT_QTOPENGL_LIBRARY};${QT_QTXML_LIBRARY};${QT_QTSVG_LIBRARY}")    
-  else(QT_QTDBUS_FOUND)
-    try_compile(test_result "${CMAKE_CURRENT_BINARY_DIR}/test-${test_target}"
-      ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.cpp
-      COMPILE_DEFINITIONS -DTEST_${test_target}
-      CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_SYSTEM_INCLUDE_PATH};${QT_INCLUDE_DIR}"
-      "-DLINK_LIBRARIES:STRING=${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};${QT_QTNETWORK_LIBRARY};${QT_QTOPENGL_LIBRARY};${QT_QTXML_LIBRARY};${QT_QTSVG_LIBRARY}")    
-  endif(QT_QTDBUS_FOUND)
+  
+  try_compile(test_result "${CMAKE_CURRENT_BINARY_DIR}/test-${test_target}"
+    ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.cpp
+    COMPILE_DEFINITIONS -DTEST_${test_target}
+    CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+    "-DLINK_LIBRARIES:STRING=${_CMAKE_REQUIRED_LIBRARIES}")
   if(test_result)
     message(STATUS "${test_target} *Undefined*")
   else(test_result)
@@ -172,6 +165,11 @@ foreach(test_target ${test_targets})
   endif(test_result)
 endforeach(test_target ${test_targets})
 
+set(WITH_QT3_SUPPORT OFF CACHE BOOL "Include Qt3 Support members in QtCore and QtGui smoke modules")
+if(WITH_QT3_SUPPORT)
+    list(APPEND qtdefines "QT3_SUPPORT")
+endif(WITH_QT3_SUPPORT)
+
 # string(REGEX REPLACE ";" "\n" qtdefines ${qtdefines})
 # file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/../qtdefines-ng ${qtdefines})
 file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/../qtdefines)

data/ext/smoke/qtcore/smokeconfig.xml

@@ -75,6 +75,7 @@
         <class>QDataStream</class>
         <class>QDate</class>
         <class>QDateTime</class>
+        <class>QDebug</class>
         <class>QDir</class>
         <class>QDirIterator</class>
         <class>QDynamicPropertyChangeEvent</class>

data/ext/smoke/qtdbus/smokeconfig.xml

@@ -56,6 +56,8 @@
         <class>QDBusPendingCallWatcher</class>
         <class>QDBusServer</class>
         <class>QDBusServiceWatcher</class>
+        <class>QDBusUnixFileDescriptor</class>
+        <class>QDBusVirtualObject</class>
 
         <!-- namespaces -->
         <class>QDBus</class>

data/ext/smoke/qtgui/smokeconfig.xml

@@ -14,7 +14,7 @@
         <typeName>HINSTANCE__</typeName>
         <typeName>HPALETTE__</typeName>
         <typeName>HRGN__</typeName>
-        <typeName>HWND__</typeName>          
+        <typeName>HWND__</typeName>
     </scalarTypes>
     <voidpTypes>
         <!-- both are classes, but they are represented as Smoke::t_voidp -->
@@ -27,7 +27,7 @@
         <typeName>HINSTANCE__</typeName>
         <typeName>HPALETTE__</typeName>
         <typeName>HRGN__</typeName>
-        <typeName>HWND__</typeName>  
+        <typeName>HWND__</typeName>
     </voidpTypes>
     <exclude>
         <!-- we don't want private stuff in smoke.. -->
@@ -46,8 +46,9 @@
         <signature>.*qFrom.*Endian_helper.*</signature>
         <signature>.*QPixmapData.*</signature>
         <signature>.*qt_x11_getX11InfoForWindow.*</signature>
+        <!-- OS X internal stuff -->
         <signature>.*qt_mac_set_cursor.*</signature>
-        <signature>.*QMenu::macMenu.*</signature>
+        <signature>.*QMenu::macMenu\(.*</signature>
    </exclude>
     <functions>
         <!-- include functions starting with 'q' -->
@@ -72,9 +73,13 @@
         <class>QAbstractTextDocumentLayout::Selection</class>
         <class>QAbstractUndoItem</class>
         <class>QAccessible2</class>
+        <class>QAccessible2::TableModelChange</class>
         <class>QAccessible2Interface</class>
         <class>QAccessibleActionInterface</class>
         <class>QAccessibleApplication</class>
+        <class>QAccessibleBridge</class>
+        <!-- <class>QAccessibleBridgeFactoryInterface</class>
+        <class>QAccessibleBridgePlugin</class> -->
         <class>QAccessible</class>
         <class>QAccessibleEditableTextInterface</class>
         <class>QAccessibleEvent</class>
@@ -87,6 +92,8 @@
         <class>QAccessiblePlugin</class>
         <class>QAccessibleSimpleEditableTextInterface</class>
         <class>QAccessibleTableInterface</class>
+        <class>QAccessibleTable2Interface</class>
+        <class>QAccessibleTable2CellInterface</class>
         <class>QAccessibleTextInterface</class>
         <class>QAccessibleValueInterface</class>
         <class>QAccessibleWidget</class>
@@ -137,7 +144,6 @@
         <class>QDragResponseEvent</class>
         <class>QDropEvent</class>
         <class>QErrorMessage</class>
-        <class>QFactoryInterface</class>
         <class>QFileDialogArgs</class>
         <class>QFileDialog</class>
         <class>QFileDialog::Options</class>
@@ -160,6 +166,7 @@
         <class>QGesture</class>
         <class>QGestureEvent</class>
         <class>QGestureRecognizer</class>
+        <class>QGlyphRun</class>
         <class>QGradient</class>
         <class>QGraphicsAnchor</class>
         <class>QGraphicsAnchorLayout</class>
@@ -278,6 +285,7 @@
         <class>QPaintEngine</class>
         <class>QPaintEngineState</class>
         <class>QPainter</class>
+        <class>QPainter::PixmapFragment</class>
         <class>QPainterPath</class>
         <class>QPainterPath::Element</class>
         <class>QPainterPathStroker</class>
@@ -312,6 +320,7 @@
         <class>QQuaternion</class>
         <class>QRadialGradient</class>
         <class>QRadioButton</class>
+        <class>QRawFont</class>
         <class>QRegExpValidator</class>
         <class>QRegion</class>
         <class>QResizeEvent</class>
@@ -341,6 +350,7 @@
         <class>QStackedWidget</class>
         <class>QStandardItem</class>
         <class>QStandardItemModel</class>
+        <class>QStaticText</class>
         <class>QStatusBar</class>
         <class>QStatusTipEvent</class>
         <class>QStringListModel</class>

data/ext/smoke/qthelp/smokeconfig.xml

@@ -28,6 +28,7 @@
         <signature>.*qFindString.*</signature>
         <!-- windows internal helper functions -->
         <signature>.*qFrom.*Endian_helper.*</signature>
+        <!-- OS X internal stuff -->
         <signature>.*qt_mac_set_cursor.*</signature>
    </exclude>
     <functions>

data/ext/smoke/qtmultimedia/smokeconfig.xml

@@ -25,6 +25,7 @@
         <signature>.*qFindString.*</signature>
         <!-- windows internal helper functions -->
         <signature>.*qFrom.*Endian_helper.*</signature>
+        <!-- OS X internal stuff -->
         <signature>.*qt_mac_set_cursor.*</signature>
    </exclude>
     <functions>

data/ext/smoke/qtnetwork/smokeconfig.xml

@@ -43,6 +43,8 @@
         <class>QHostInfo</class>
         <class>QHttp</class>
         <class>QHttpHeader</class>
+        <class>QHttpMultiPart</class>
+        <class>QHttpPart</class>
         <class>QHttpRequestHeader</class>
         <class>QHttpResponseHeader</class>
         <class>QIPv6Address</class>

data/ext/smoke/qtopengl/smokeconfig.xml

@@ -27,6 +27,7 @@
         <signature>.*qFindString.*</signature>
         <!-- windows internal helper functions -->
         <signature>.*qFrom.*Endian_helper.*</signature>
+        <!-- OS X internal stuff -->
         <signature>.*qt_mac_set_cursor.*</signature>
    </exclude>
     <functions>

data/ext/smoke/qtsql/smokeconfig.xml

@@ -27,6 +27,7 @@
         <signature>.*qFindString.*</signature>
         <!-- windows internal helper functions -->
         <signature>.*qFrom.*Endian_helper.*</signature>
+        <!-- OS X internal stuff -->
         <signature>.*qt_mac_set_cursor.*</signature>
    </exclude>
     <functions>

data/ext/smoke/qtsvg/smokeconfig.xml

@@ -27,6 +27,7 @@
         <signature>.*qFindString.*</signature>
         <!-- windows internal helper functions -->
         <signature>.*qFrom.*Endian_helper.*</signature>
+        <!-- OS X internal stuff -->
         <signature>.*qt_mac_set_cursor.*</signature>
    </exclude>
     <functions>

data/ext/smoke/qtwebkit/smokeconfig.xml

@@ -15,6 +15,7 @@
         <typeName>QString</typeName>
     </voidpTypes>
     <classList>
+        <class>QGraphicsWebView</class>
         <class>QWebDatabase</class>
         <class>QWebElement</class>
         <class>QWebElementCollection</class>
@@ -33,11 +34,13 @@
         <class>QWebPage::ErrorPageExtensionReturn</class>
         <class>QWebPage::ExtensionOption</class>
         <class>QWebPage::ExtensionReturn</class>
+        <class>QWebPage::ViewportAttributes</class>
         <class>QWebPluginFactory</class>
         <class>QWebPluginFactory::ExtensionOption</class>
         <class>QWebPluginFactory::ExtensionReturn</class>
         <class>QWebPluginFactory::MimeType</class>
         <class>QWebPluginFactory::Plugin</class>
+        <class>QWebScriptWorld</class>
         <class>QWebSecurityOrigin</class>
         <class>QWebSettings</class>
         <class>QWebView</class>

data/extconf.rb

@@ -12,18 +12,18 @@ macosx  = true if platform =~ /darwin/
 ruby_version = '1.9'
 ruby_version = '1.8' if RUBY_VERSION.split('.')[1].to_i == 8
 
-def find_qt_sdk
+if windows
+  # README! - Modify this path if you have QT installed somewhere else
+  # or if you have a different version of QT you want to link to.
+  qt_sdk_path = "C:\\Qt\\4.8.3"
   begin
-    entries = Dir.entries("C:\\Qt")
+    File::Stat.new(qt_sdk_path)
   rescue
-    raise "Could not find Qt SDK in C:\\Qt"
+    puts "ERROR! QT SDK doesn't exist at #{qt_sdk_path}"
+    exit # Not much we can do if the QT SDK doesn't exist
   end
-  entries.sort!
-  "C:\\Qt\\" + entries[-1]
 end
 
-qt_sdk_path = find_qt_sdk() if windows
-
 File.open('Makefile', 'w') do |file|
   if windows
     file.puts "all: clean build"
@@ -34,16 +34,18 @@ File.open('Makefile', 'w') do |file|
     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\\bearer"
     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\\qmltooling"
     file.puts "\t-mkdir bin\\plugins\\sqldrivers"
     file.puts "\t-mkdir lib\\1.8"
     file.puts "\t-mkdir lib\\1.9"
-    file.puts ""    
+    file.puts ""
     file.puts "clean: makedirs"
     file.puts "\t-cd ext\\build && rmdir /S /Q CMakeFiles"
     file.puts "\t-cd ext\\build && rmdir /S /Q generator"
@@ -51,18 +53,20 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-cd ext\\build && rmdir /S /Q ruby"
     file.puts "\t-cd ext\\build && del /F /Q *"
     file.puts ""
-    file.puts "distclean: clean" 
+    file.puts "distclean: clean"
     file.puts "\t-cd bin && del /F /Q *.dll"
     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\\bearer && 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\\qmltooling && 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 *"
@@ -73,7 +77,7 @@ File.open('Makefile', 'w') do |file|
     file.puts ""
     file.puts "build: makedirs"
     file.puts "\tset CC=mingw32-gcc.exe"
-    file.puts "\tset CXX=mingw32-g++.exe"  
+    file.puts "\tset CXX=mingw32-g++.exe"
     file.puts "\t-cd ext\\build && \\"
     file.puts "cmake \\"
     file.puts "-G \"MinGW Makefiles\" \\"
@@ -133,18 +137,22 @@ File.open('Makefile', 'w') do |file|
     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"
+    file.puts "\tcopy #{qt_sdk_path}\\bin\\*.dll bin"
     file.puts "\tdel /F /Q bin\\*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 "\tcopy #{qt_sdk_path}\\plugins\\accessible\\*.dll bin\\plugins\\accessible"
+    file.puts "\tcopy #{qt_sdk_path}\\plugins\\bearer\\*.dll bin\\plugins\\bearer"
+    file.puts "\tcopy #{qt_sdk_path}\\plugins\\codecs\\*.dll bin\\plugins\\codecs"
+    file.puts "\tcopy #{qt_sdk_path}\\plugins\\designer\\*.dll bin\\plugins\\designer"
+    file.puts "\tcopy #{qt_sdk_path}\\plugins\\graphicssystems\\*.dll bin\\plugins\\graphicssystems"
+    file.puts "\tcopy #{qt_sdk_path}\\plugins\\iconengines\\*.dll bin\\plugins\\iconengines"
+    file.puts "\tcopy #{qt_sdk_path}\\plugins\\imageformats\\*.dll bin\\plugins\\imageformats"
+    file.puts "\tcopy #{qt_sdk_path}\\plugins\\phonon_backend\\*.dll bin\\plugins\\phonon_backend"
+    file.puts "\tcopy #{qt_sdk_path}\\plugins\\qmltooling\\*.dll bin\\plugins\\qmltooling"
+    file.puts "\tcopy #{qt_sdk_path}\\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\\bearer\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\bearer\\*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"
@@ -157,6 +165,8 @@ File.open('Makefile', 'w') do |file|
     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\\qmltooling\\*d.dll"
+    file.puts "\tdel /F /Q bin\\plugins\\qmltooling\\*d4.dll"
     file.puts "\tdel /F /Q bin\\plugins\\sqldrivers\\*d.dll"
     file.puts "\tdel /F /Q bin\\plugins\\sqldrivers\\*d4.dll"
   else
@@ -168,15 +178,17 @@ File.open('Makefile', 'w') do |file|
     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/bearer"
     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/qmltooling"
     file.puts "\t-mkdir bin/plugins/sqldrivers"
     file.puts "\t-mkdir lib/1.8"
-    file.puts "\t-mkdir lib/1.9"    
+    file.puts "\t-mkdir lib/1.9"
     file.puts ""
     file.puts "clean: makedirs"
     file.puts "\t-cd ext/build; rm -rf CMakeFiles"
@@ -191,17 +203,19 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-cd bin && rm *.exe"
     file.puts "\t-cd bin/plugins && rm *"
     file.puts "\t-cd bin/plugins/accessible && rm *"
+    file.puts "\t-cd bin/plugins/bearer && 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/qmltooling && 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-cd lib/1.9 && rm *"
     file.puts "\t-rm Makefile"
     file.puts "\t-rm qtbindings-*.gem"
     file.puts ""
@@ -211,7 +225,7 @@ File.open('Makefile', 'w') do |file|
     file.puts "-G \"Unix Makefiles\" \\"
     if ARGV[0] == '-d'
       file.puts "-DCMAKE_BUILD_TYPE=Debug \\"
-    end   
+    end
     file.puts "-Wno-dev \\"
     file.puts "-DENABLE_SMOKE=on \\"
     file.puts "-DENABLE_QTCORE_SMOKE=on \\"
@@ -235,7 +249,7 @@ File.open('Makefile', 'w') do |file|
     file.puts "-DENABLE_QTTEST=on \\"
     file.puts ".."
     file.puts "\tcd ext/build; make"
-    file.puts ""    
+    file.puts ""
     file.puts "install: makedirs"
     if macosx
       file.puts "\t-cp ext/build/smoke/smokeapi/smokeapi bin/#{ruby_version}"