qtbindings 4.6.3.2 → 4.6.3.3

data/ext/ruby/qtdeclarative/qtdeclarative.cpp

@@ -3,6 +3,7 @@
 #undef write
 #undef connect
 #undef accept
+#undef truncate
 
 #include <QHash>
 #include <QList>

data/ext/ruby/qtdeclarative/qtdeclarativehandlers.cpp

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

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

@@ -300,7 +300,8 @@ Binding::callMethod(Smoke::Index method, void *ptr, Smoke::Stack args, bool /*is
 	}
 		// If the virtual method hasn't been overriden, just call the C++ one.
 		// During GC, avoid checking for override and just call the C++ version
-	if (rb_during_gc() || rb_respond_to(obj, rb_intern(methodName)) == 0) {
+		// If not in a ruby thread, just call the C++ version
+	if (rb_during_gc() || ruby_check_stack() || rb_respond_to(obj, rb_intern(methodName)) == 0) {
     	return false;
 	}
 	QtRuby::VirtualMethodCall c(smoke, method, args, obj, ALLOCA_N(VALUE, smoke->methods[method].numArgs));

data/ext/ruby/qtscript/qtscript.cpp

@@ -20,6 +20,7 @@
 #undef write
 #undef connect
 #undef accept
+#undef truncate
 
 #include <QHash>
 #include <QList>

data/ext/ruby/qtscript/qtscripthandlers.cpp

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

data/ext/ruby/qttest/qttest.cpp

@@ -20,6 +20,7 @@
 #undef write
 #undef connect
 #undef accept
+#undef truncate
 
 #include <QHash>
 #include <QList>

data/ext/ruby/qttest/qttesthandlers.cpp

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

data/ext/ruby/qtuitools/qtuitools.cpp

@@ -20,6 +20,7 @@
 #undef write
 #undef connect
 #undef accept
+#undef truncate
 
 #include <QHash>
 #include <QList>

data/ext/ruby/qtuitools/qtuitoolshandlers.cpp

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

data/ext/ruby/qtwebkit/qtwebkit.cpp

@@ -3,6 +3,7 @@
 #undef write
 #undef connect
 #undef accept
+#undef truncate
 
 #include <QHash>
 #include <QList>

data/ext/ruby/qtwebkit/qtwebkithandlers.cpp

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

data/lib/Qt/qtruby4.rb

@@ -3161,8 +3161,14 @@ class Module
   private :_constants, :_instance_methods
   private :_protected_instance_methods, :_public_instance_methods
 
-  def constants
-    qt_methods(_constants, 0x10, true)
+  if RUBY_VERSION < '1.9'
+    def constants
+      qt_methods(_constants, 0x10, true)
+    end
+  else
+    def constants(_arg = true)
+      qt_methods(_constants, 0x10, true)
+    end
   end
 
   def instance_methods(inc_super=true)

data/lib/qtbindings_version.rb

@@ -1,2 +1,2 @@
-QTBINDINGS_VERSION = '4.6.3.2'
-QTBINDINGS_RELEASE_DATE = '2010-12-06 07:43:59 -0700'
+QTBINDINGS_VERSION = '4.6.3.3'
+QTBINDINGS_RELEASE_DATE = '2011-08-05 23:17:11 -0600'

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 4
   - 6
   - 3
-  - 2
-  version: 4.6.3.2
+  - 3
+  version: 4.6.3.3
 platform: ruby
 authors: 
 - Richard Dale
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -07:00
+date: 2011-08-05 00:00:00 -06:00
 default_executable: 
 dependencies: []