qtbindings 4.8.6.2 → 4.8.6.3

data/ext/smoke/smokebase/CMakeLists.txt

@@ -1,11 +1,11 @@
-IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
-    ADD_DEFINITIONS(-DGCC_VISIBILITY)
-ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-add_library(smokebase SHARED smokebase.cpp)
-target_link_libraries(smokebase)
-set_target_properties(smokebase PROPERTIES VERSION 3.0.0 SOVERSION 3)
-
-install(TARGETS smokebase DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
+    ADD_DEFINITIONS(-DGCC_VISIBILITY)
+ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
+
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+add_library(smokebase SHARED smokebase.cpp)
+target_link_libraries(smokebase)
+set_target_properties(smokebase PROPERTIES VERSION 3.0.0 SOVERSION 3)
+
+install(TARGETS smokebase DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})

data/ext/smoke/smokebase/smokebase.cpp

@@ -1,6 +1,6 @@
-#define BASE_SMOKE_BUILDING
-
-#include <smoke.h>
-
-Smoke::ClassMap Smoke::classMap;
-Smoke::ModuleIndex Smoke::NullModuleIndex;
+#define BASE_SMOKE_BUILDING
+
+#include <smoke.h>
+
+Smoke::ClassMap Smoke::classMap;
+Smoke::ModuleIndex Smoke::NullModuleIndex;

data/ext/smoke/solid_smoke.h

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

data/extconf.rb

@@ -18,11 +18,11 @@ end
 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.6"
+  qt_sdk_path = ENV['QTBINDINGS_QT_PATH']
   begin
     File::Stat.new(qt_sdk_path)
   rescue
-    puts "ERROR! QT SDK doesn't exist at #{qt_sdk_path}"
+    puts "ERROR! QT SDK doesn't exist at #{qt_sdk_path}. Please set environment QTBINDINGS_QT_PATH"
     exit # Not much we can do if the QT SDK doesn't exist
   end
 end

data/lib/Qt.rb

@@ -1 +1 @@
-require 'Qt4'
+require 'Qt4'

data/lib/Qt4.rb

@@ -1,111 +1,111 @@
-windows = false
-platform = RUBY_PLATFORM.split("-")[1]
-windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
-
-begin
-  require 'thread'
-  require 'qtbindings-qt'
-rescue LoadError
-  # Oh well - Hopefully not using the Windows binary gem
-end
-
-ruby_version = RUBY_VERSION.split('.')[0..1].join('.')
-if windows
-  ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + File.join(File.dirname(__FILE__), "../lib/#{ruby_version}") + ';' + File.join(File.dirname(__FILE__), "../bin/#{ruby_version}") + ';' + ENV['PATH']
-end
-$: << File.join(File.dirname(__FILE__), "../lib/#{ruby_version}")
-require "#{ruby_version}/qtruby4"
-
-module Qt
-  class RubyThreadFix < Qt::Object
-    slots 'ruby_thread_timeout()'
-    slots 'callback_timeout()'
-    slots 'callback_timeout2()'
-    @@queue  = Queue.new
-
-    def initialize
-      super()
-      # Enable threading
-      @ruby_thread_sleep_period = 0.01
-      @ruby_thread_timer = Qt::Timer.new(self)
-      connect(@ruby_thread_timer, SIGNAL('timeout()'), SLOT('ruby_thread_timeout()'))
-      @ruby_thread_timer.start(0)
-      @callback_timer = Qt::Timer.new(self)
-      connect(@callback_timer, SIGNAL('timeout()'), SLOT('callback_timeout()'))
-      @callback_timer.start(1)
-      @callback_timer2 = Qt::Timer.new(self)
-      connect(@callback_timer2, SIGNAL('timeout()'), SLOT('callback_timeout2()'))
-      @running = true
-    end
-
-    def ruby_thread_timeout
-      sleep(@ruby_thread_sleep_period)
-    end
-
-    def callback_timeout
-      if !@@queue.empty?
-        # Start a backup timer in case this one goes modal.
-        @callback_timer2.start(100)
-        @@queue.pop.call until @@queue.empty?
-        # Cancel the backup timer
-        @callback_timer2.stop if @callback_timer2
-      end
-    end
-
-    def callback_timeout2
-      @callback_timer2.interval = 10
-      @@queue.pop.call until @@queue.empty?
-    end
-
-    def self.queue
-      @@queue
-    end
-
-    def stop
-      if @running
-        @running = false
-        @ruby_thread_timer.stop
-        @callback_timer.stop
-        @callback_timer2.stop
-        @ruby_thread_timer.dispose
-        @callback_timer.dispose
-        @callback_timer2.dispose
-        @ruby_thread_timer = nil
-        @callback_timer = nil
-        @callback_timer2 = nil
-      end
-    end
-  end
-
-  # Code which accesses the GUI must be executed in the main QT GUI thread.
-  # This method allows code in another thread to execute safely in the main GUI
-  # thread. By default it will block the main GUI thread until the code in the
-  # block completes althought this can be changed by passing false for the
-  # first parameter.
-  #
-  # @param blocking [Boolean] Whether to block the main thread until the code
-  #   in the block finishing executing. If false the main thread will be
-  #   allowed to continue and the block code will execute in parallel.
-  # @param sleep_period [Float] The amount of time to sleep between checking
-  #   whether the code in the block has finished executing
-  # @param delay_execution [Boolean] Only used if called from the main GUI
-  #   thread. Allows the block to be executed in parallel with the main thread.
-  def self.execute_in_main_thread (blocking = true, sleep_period = 0.001, delay_execution = false)
-    if Thread.current != Thread.main
-      complete = false
-      RubyThreadFix.queue << lambda {|| yield; complete = true}
-      if blocking
-        until complete
-          sleep(sleep_period)
-        end
-      end
-    else
-      if delay_execution
-        RubyThreadFix.queue << lambda {|| yield; complete = true}
-      else
-        yield
-      end
-    end
-  end
-
-end # module Qt
+windows = false
+platform = RUBY_PLATFORM.split("-")[1]
+windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
+
+begin
+  require 'thread'
+  require 'qtbindings-qt'
+rescue LoadError
+  # Oh well - Hopefully not using the Windows binary gem
+end
+
+ruby_version = RUBY_VERSION.split('.')[0..1].join('.')
+if windows
+  ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + File.join(File.dirname(__FILE__), "../lib/#{ruby_version}") + ';' + File.join(File.dirname(__FILE__), "../bin/#{ruby_version}") + ';' + ENV['PATH']
+end
+$: << File.join(File.dirname(__FILE__), "../lib/#{ruby_version}")
+require "#{ruby_version}/qtruby4"
+
+module Qt
+  class RubyThreadFix < Qt::Object
+    slots 'ruby_thread_timeout()'
+    slots 'callback_timeout()'
+    slots 'callback_timeout2()'
+    @@queue  = Queue.new
+
+    def initialize
+      super()
+      # Enable threading
+      @ruby_thread_sleep_period = 0.01
+      @ruby_thread_timer = Qt::Timer.new(self)
+      connect(@ruby_thread_timer, SIGNAL('timeout()'), SLOT('ruby_thread_timeout()'))
+      @ruby_thread_timer.start(0)
+      @callback_timer = Qt::Timer.new(self)
+      connect(@callback_timer, SIGNAL('timeout()'), SLOT('callback_timeout()'))
+      @callback_timer.start(1)
+      @callback_timer2 = Qt::Timer.new(self)
+      connect(@callback_timer2, SIGNAL('timeout()'), SLOT('callback_timeout2()'))
+      @running = true
+    end
+
+    def ruby_thread_timeout
+      sleep(@ruby_thread_sleep_period)
+    end
+
+    def callback_timeout
+      if !@@queue.empty?
+        # Start a backup timer in case this one goes modal.
+        @callback_timer2.start(100)
+        @@queue.pop.call until @@queue.empty?
+        # Cancel the backup timer
+        @callback_timer2.stop if @callback_timer2
+      end
+    end
+
+    def callback_timeout2
+      @callback_timer2.interval = 10
+      @@queue.pop.call until @@queue.empty?
+    end
+
+    def self.queue
+      @@queue
+    end
+
+    def stop
+      if @running
+        @running = false
+        @ruby_thread_timer.stop
+        @callback_timer.stop
+        @callback_timer2.stop
+        @ruby_thread_timer.dispose
+        @callback_timer.dispose
+        @callback_timer2.dispose
+        @ruby_thread_timer = nil
+        @callback_timer = nil
+        @callback_timer2 = nil
+      end
+    end
+  end
+
+  # Code which accesses the GUI must be executed in the main QT GUI thread.
+  # This method allows code in another thread to execute safely in the main GUI
+  # thread. By default it will block the main GUI thread until the code in the
+  # block completes althought this can be changed by passing false for the
+  # first parameter.
+  #
+  # @param blocking [Boolean] Whether to block the main thread until the code
+  #   in the block finishing executing. If false the main thread will be
+  #   allowed to continue and the block code will execute in parallel.
+  # @param sleep_period [Float] The amount of time to sleep between checking
+  #   whether the code in the block has finished executing
+  # @param delay_execution [Boolean] Only used if called from the main GUI
+  #   thread. Allows the block to be executed in parallel with the main thread.
+  def self.execute_in_main_thread (blocking = true, sleep_period = 0.001, delay_execution = false)
+    if Thread.current != Thread.main
+      complete = false
+      RubyThreadFix.queue << lambda {|| yield; complete = true}
+      if blocking
+        until complete
+          sleep(sleep_period)
+        end
+      end
+    else
+      if delay_execution
+        RubyThreadFix.queue << lambda {|| yield; complete = true}
+      else
+        yield
+      end
+    end
+  end
+
+end # module Qt

data/lib/qtbindings_version.rb

@@ -1,2 +1,2 @@
-QTBINDINGS_VERSION = '4.8.6.2'
-QTBINDINGS_RELEASE_DATE = '2015-05-08 08:23:33 -0600'
+QTBINDINGS_VERSION = '4.8.6.3'
+QTBINDINGS_RELEASE_DATE = '2016-11-22 10:26:07 -0700'

data/lib/qtdeclarative/qtdeclarative.rb

@@ -1,17 +1,17 @@
-#!/usr/bin/ruby
-
-module QtDeclarative
-    module Internal
-        def self.init_all_classes
-            getClassList.each do |c|
-                classname = Qt::Internal::normalize_classname(c)
-                id = Qt::Internal::findClass(c);
-                Qt::Internal::insert_pclassid(classname, id)
-                Qt::Internal::cpp_names[classname] = c
-                klass = Qt::Internal::isQObject(c) ? Qt::Internal::create_qobject_class(classname, Qt) \
-                                                    : Qt::Internal::create_qt_class(classname, Qt)
-                Qt::Internal::classes[classname] = klass unless klass.nil?
-            end
-        end
-    end
-end
+#!/usr/bin/ruby
+
+module QtDeclarative
+    module Internal
+        def self.init_all_classes
+            getClassList.each do |c|
+                classname = Qt::Internal::normalize_classname(c)
+                id = Qt::Internal::findClass(c);
+                Qt::Internal::insert_pclassid(classname, id)
+                Qt::Internal::cpp_names[classname] = c
+                klass = Qt::Internal::isQObject(c) ? Qt::Internal::create_qobject_class(classname, Qt) \
+                                                    : Qt::Internal::create_qt_class(classname, Qt)
+                Qt::Internal::classes[classname] = klass unless klass.nil?
+            end
+        end
+    end
+end

data/lib/qtscript/qtscript.rb

@@ -1,40 +1,40 @@
-=begin
-/***************************************************************************
-                          qtscript.rb  -  QtScript ruby client lib
-                             -------------------
-    begin                : 11-07-2008
-    copyright            : (C) 2008 by Richard Dale
-    email                : richard.j.dale@gmail.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-=end
-
-module QtScript
-  module Internal
-    def self.init_all_classes
-#      Qt::Internal::add_normalize_proc(Proc.new do |classname|
-#        if classname =~ /^QtScript/
-#          now = classname.sub(/^QtScript?(?=[A-Z])/,'QtScript::')
-#        end
-#        now
-#      end)
-      getClassList.each do |c|
-        classname = Qt::Internal::normalize_classname(c)
-        id = Qt::Internal::findClass(c);
-        Qt::Internal::insert_pclassid(classname, id)
-        Qt::Internal::cpp_names[classname] = c
-        klass = Qt::Internal::isQObject(c) ? Qt::Internal::create_qobject_class(classname, Qt) \
-                                           : Qt::Internal::create_qt_class(classname, Qt)
-        Qt::Internal::classes[classname] = klass unless klass.nil?
-      end
-    end
-  end
-end
+=begin
+/***************************************************************************
+                          qtscript.rb  -  QtScript ruby client lib
+                             -------------------
+    begin                : 11-07-2008
+    copyright            : (C) 2008 by Richard Dale
+    email                : richard.j.dale@gmail.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+=end
+
+module QtScript
+  module Internal
+    def self.init_all_classes
+#      Qt::Internal::add_normalize_proc(Proc.new do |classname|
+#        if classname =~ /^QtScript/
+#          now = classname.sub(/^QtScript?(?=[A-Z])/,'QtScript::')
+#        end
+#        now
+#      end)
+      getClassList.each do |c|
+        classname = Qt::Internal::normalize_classname(c)
+        id = Qt::Internal::findClass(c);
+        Qt::Internal::insert_pclassid(classname, id)
+        Qt::Internal::cpp_names[classname] = c
+        klass = Qt::Internal::isQObject(c) ? Qt::Internal::create_qobject_class(classname, Qt) \
+                                           : Qt::Internal::create_qt_class(classname, Qt)
+        Qt::Internal::classes[classname] = klass unless klass.nil?
+      end
+    end
+  end
+end

data/lib/qttest/qttest.rb

@@ -1,166 +1,166 @@
-=begin
-/***************************************************************************
-                          qttest.rb  -  QtTest ruby client lib
-                             -------------------
-    begin                : 29-10-2008
-    copyright            : (C) 2008 by Richard Dale
-    email                : richard.j.dale@gmail.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-=end
-
-module QtTest
-  module Internal
-    def self.init_all_classes
-      getClassList.each do |c|
-        classname = Qt::Internal::normalize_classname(c)
-        id = Qt::Internal::findClass(c);
-        Qt::Internal::insert_pclassid(classname, id)
-        Qt::Internal::cpp_names[classname] = c
-        klass = Qt::Internal::isQObject(c) ? Qt::Internal::create_qobject_class(classname, Qt)  : Qt::Internal::create_qt_class(classname, Qt)
-        Qt::Internal::classes[classname] = klass unless klass.nil?
-      end
-    end
-  end
-end
-
-module Qt
-  class Test < Base
-      
-    # This is the isValidSlot() function in testlib/qtestcase.cpp translated
-    # to Ruby. Probably could be a bit shorter in Ruby..
-    def self.validSlot?(sl)
-      if sl.access != Qt::MetaMethod::Private || !sl.parameterTypes.empty? ||
-         sl.typeName != "" || sl.methodType != Qt::MetaMethod::Slot
-        return false
-      end
-      
-      sig = sl.signature
-      len = sig.length
-      
-      if len < 2
-        return false
-      end
-      
-      if sig[len - 2, 1] != '(' || sig[len - 1, 1] != ')'
-        return false
-      end
-      
-      if len > 7 && sig[len - 7, len] == "_data()"
-        return false
-      end
-      
-      if sig == "initTestCase()" || sig == "cleanupTestCase()" ||
-         sig == "cleanup()" || sig == "init()"
-        return false
-      end
-
-      return true
-    end
-    
-    def self.current_binding
-        @@current_binding
-    end
-    
-    def self.current_binding=(b)
-        @@current_binding = b
-    end
-    
-    def self.qExec(*args)
-      test_functions = []
-      meta = args[0].metaObject
-      className = meta.className
-      for i in 0...meta.methodCount
-        sl = meta.method(i)
-        if Test.validSlot?(sl)
-            test_functions << sl.signature.sub("()", "").to_sym
-        end
-      end
-      
-      # Trap calls to the test functions and save their binding, so that
-      # the various test methods, like QVERIFY(), can evaluate the code strings
-      # passed to them in the context of the test function
-      trace_func = set_trace_func proc { |event, file, line, id, binding, klass|
-        if event == 'call' && klass.name == className && test_functions.include?(id)
-          Test.current_binding = binding
-        end
-      }
-      
-      if args.length == 2 && args[1].kind_of?(Array)
-        super(args[0], args[1].length + 1, [$0] + args[1])
-      else
-        super(*args)
-      end
-      
-      set_trace_func(trace_func)
-    end
-  end 
-
-  class Base
-    def QVERIFY(statement)
-      file, line = caller(1)[0].split(':')
-      if !Qt::Test.qVerify(eval(statement, Qt::Test.current_binding), statement, "", file, line.to_i)
-          return eval('return', Qt::Test.current_binding)
-      end
-    end
-    
-    def QFAIL(message)
-      file, line = caller(1)[0].split(':')
-      Qt::Test.qFail(message, file, line.to_i)
-      return eval('return', Qt::Test.current_binding)
-    end
-    
-    def QVERIFY2(statement, description)
-      file, line = caller(1)[0].split(':')
-      if eval(statement, Qt::Test.current_binding)
-        if !Qt::Test.qVerify(true, statement, description, file, line.to_i)
-          return eval('return', Qt::Test.current_binding)
-        end
-      else
-        if !Qt::Test.qVerify(false, statement, description, file, line.to_i)
-          return eval('return', Qt::Test.current_binding)
-        end
-      end
-    end
-    
-    def QCOMPARE(actual, expected)
-      file, line = caller(1)[0].split(':')
-      if !Qt::Test.qCompare(eval(actual, Qt::Test.current_binding), eval(expected, Qt::Test.current_binding), actual, expected, file, line.to_i)    
-        return eval('return', Qt::Test.current_binding)
-      end
-    end
-    
-    def QSKIP(statement, mode)
-      file, line = caller(1)[0].split(':')
-      Qt::Test.qSkip(statement, mode, file, line.to_i)
-      return eval('return', Qt::Test.current_binding)
-    end
-    
-    def QEXPECT_FAIL(dataIndex, comment, mode)
-      file, line = caller(1)[0].split(':')
-      if !Qt::Test.qExpectFail(dataIndex, comment, mode, file, line.to_i)
-        return eval('return', Qt::Test.current_binding)
-      end
-    end
-  
-    def QTEST(actual, testElement)
-      file, line = caller(1)[0].split(':')
-      if !Qt::Test.qTest(eval(actual, Qt::Test.current_binding), eval(testElement, Qt::Test.current_binding), actual, testElement, file, line.to_i)
-        return eval('return', Qt::Test.current_binding)
-      end
-    end
-    
-    def QWARN(msg)
-      Qt::Test.qWarn(msg)
-    end
-  end
-end
-
+=begin
+/***************************************************************************
+                          qttest.rb  -  QtTest ruby client lib
+                             -------------------
+    begin                : 29-10-2008
+    copyright            : (C) 2008 by Richard Dale
+    email                : richard.j.dale@gmail.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+=end
+
+module QtTest
+  module Internal
+    def self.init_all_classes
+      getClassList.each do |c|
+        classname = Qt::Internal::normalize_classname(c)
+        id = Qt::Internal::findClass(c);
+        Qt::Internal::insert_pclassid(classname, id)
+        Qt::Internal::cpp_names[classname] = c
+        klass = Qt::Internal::isQObject(c) ? Qt::Internal::create_qobject_class(classname, Qt)  : Qt::Internal::create_qt_class(classname, Qt)
+        Qt::Internal::classes[classname] = klass unless klass.nil?
+      end
+    end
+  end
+end
+
+module Qt
+  class Test < Base
+      
+    # This is the isValidSlot() function in testlib/qtestcase.cpp translated
+    # to Ruby. Probably could be a bit shorter in Ruby..
+    def self.validSlot?(sl)
+      if sl.access != Qt::MetaMethod::Private || !sl.parameterTypes.empty? ||
+         sl.typeName != "" || sl.methodType != Qt::MetaMethod::Slot
+        return false
+      end
+      
+      sig = sl.signature
+      len = sig.length
+      
+      if len < 2
+        return false
+      end
+      
+      if sig[len - 2, 1] != '(' || sig[len - 1, 1] != ')'
+        return false
+      end
+      
+      if len > 7 && sig[len - 7, len] == "_data()"
+        return false
+      end
+      
+      if sig == "initTestCase()" || sig == "cleanupTestCase()" ||
+         sig == "cleanup()" || sig == "init()"
+        return false
+      end
+
+      return true
+    end
+    
+    def self.current_binding
+        @@current_binding
+    end
+    
+    def self.current_binding=(b)
+        @@current_binding = b
+    end
+    
+    def self.qExec(*args)
+      test_functions = []
+      meta = args[0].metaObject
+      className = meta.className
+      for i in 0...meta.methodCount
+        sl = meta.method(i)
+        if Test.validSlot?(sl)
+            test_functions << sl.signature.sub("()", "").to_sym
+        end
+      end
+      
+      # Trap calls to the test functions and save their binding, so that
+      # the various test methods, like QVERIFY(), can evaluate the code strings
+      # passed to them in the context of the test function
+      trace_func = set_trace_func proc { |event, file, line, id, binding, klass|
+        if event == 'call' && klass.name == className && test_functions.include?(id)
+          Test.current_binding = binding
+        end
+      }
+      
+      if args.length == 2 && args[1].kind_of?(Array)
+        super(args[0], args[1].length + 1, [$0] + args[1])
+      else
+        super(*args)
+      end
+      
+      set_trace_func(trace_func)
+    end
+  end 
+
+  class Base
+    def QVERIFY(statement)
+      file, line = caller(1)[0].split(':')
+      if !Qt::Test.qVerify(eval(statement, Qt::Test.current_binding), statement, "", file, line.to_i)
+          return eval('return', Qt::Test.current_binding)
+      end
+    end
+    
+    def QFAIL(message)
+      file, line = caller(1)[0].split(':')
+      Qt::Test.qFail(message, file, line.to_i)
+      return eval('return', Qt::Test.current_binding)
+    end
+    
+    def QVERIFY2(statement, description)
+      file, line = caller(1)[0].split(':')
+      if eval(statement, Qt::Test.current_binding)
+        if !Qt::Test.qVerify(true, statement, description, file, line.to_i)
+          return eval('return', Qt::Test.current_binding)
+        end
+      else
+        if !Qt::Test.qVerify(false, statement, description, file, line.to_i)
+          return eval('return', Qt::Test.current_binding)
+        end
+      end
+    end
+    
+    def QCOMPARE(actual, expected)
+      file, line = caller(1)[0].split(':')
+      if !Qt::Test.qCompare(eval(actual, Qt::Test.current_binding), eval(expected, Qt::Test.current_binding), actual, expected, file, line.to_i)    
+        return eval('return', Qt::Test.current_binding)
+      end
+    end
+    
+    def QSKIP(statement, mode)
+      file, line = caller(1)[0].split(':')
+      Qt::Test.qSkip(statement, mode, file, line.to_i)
+      return eval('return', Qt::Test.current_binding)
+    end
+    
+    def QEXPECT_FAIL(dataIndex, comment, mode)
+      file, line = caller(1)[0].split(':')
+      if !Qt::Test.qExpectFail(dataIndex, comment, mode, file, line.to_i)
+        return eval('return', Qt::Test.current_binding)
+      end
+    end
+  
+    def QTEST(actual, testElement)
+      file, line = caller(1)[0].split(':')
+      if !Qt::Test.qTest(eval(actual, Qt::Test.current_binding), eval(testElement, Qt::Test.current_binding), actual, testElement, file, line.to_i)
+        return eval('return', Qt::Test.current_binding)
+      end
+    end
+    
+    def QWARN(msg)
+      Qt::Test.qWarn(msg)
+    end
+  end
+end
+