qtbindings 4.6.3.2 → 4.6.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/ext/ruby/qtdeclarative/qtdeclarative.cpp +1 -0
- data/ext/ruby/qtdeclarative/qtdeclarativehandlers.cpp +1 -0
- data/ext/ruby/qtruby/src/Qt.cpp +2 -1
- data/ext/ruby/qtscript/qtscript.cpp +1 -0
- data/ext/ruby/qtscript/qtscripthandlers.cpp +1 -0
- data/ext/ruby/qttest/qttest.cpp +1 -0
- data/ext/ruby/qttest/qttesthandlers.cpp +1 -0
- data/ext/ruby/qtuitools/qtuitools.cpp +1 -0
- data/ext/ruby/qtuitools/qtuitoolshandlers.cpp +1 -0
- data/ext/ruby/qtwebkit/qtwebkit.cpp +1 -0
- data/ext/ruby/qtwebkit/qtwebkithandlers.cpp +1 -0
- data/lib/Qt/qtruby4.rb +8 -2
- data/lib/qtbindings_version.rb +2 -2
- metadata +3 -3
data/ext/ruby/qtruby/src/Qt.cpp
CHANGED
|
@@ -300,7 +300,8 @@ Binding::callMethod(Smoke::Index method, void *ptr, Smoke::Stack args, bool /*is
|
|
|
300
300
|
}
|
|
301
301
|
// If the virtual method hasn't been overriden, just call the C++ one.
|
|
302
302
|
// During GC, avoid checking for override and just call the C++ version
|
|
303
|
-
|
|
303
|
+
// If not in a ruby thread, just call the C++ version
|
|
304
|
+
if (rb_during_gc() || ruby_check_stack() || rb_respond_to(obj, rb_intern(methodName)) == 0) {
|
|
304
305
|
return false;
|
|
305
306
|
}
|
|
306
307
|
QtRuby::VirtualMethodCall c(smoke, method, args, obj, ALLOCA_N(VALUE, smoke->methods[method].numArgs));
|
data/ext/ruby/qttest/qttest.cpp
CHANGED
data/lib/Qt/qtruby4.rb
CHANGED
|
@@ -3161,8 +3161,14 @@ class Module
|
|
|
3161
3161
|
private :_constants, :_instance_methods
|
|
3162
3162
|
private :_protected_instance_methods, :_public_instance_methods
|
|
3163
3163
|
|
|
3164
|
-
|
|
3165
|
-
|
|
3164
|
+
if RUBY_VERSION < '1.9'
|
|
3165
|
+
def constants
|
|
3166
|
+
qt_methods(_constants, 0x10, true)
|
|
3167
|
+
end
|
|
3168
|
+
else
|
|
3169
|
+
def constants(_arg = true)
|
|
3170
|
+
qt_methods(_constants, 0x10, true)
|
|
3171
|
+
end
|
|
3166
3172
|
end
|
|
3167
3173
|
|
|
3168
3174
|
def instance_methods(inc_super=true)
|
data/lib/qtbindings_version.rb
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
QTBINDINGS_VERSION = '4.6.3.
|
|
2
|
-
QTBINDINGS_RELEASE_DATE = '
|
|
1
|
+
QTBINDINGS_VERSION = '4.6.3.3'
|
|
2
|
+
QTBINDINGS_RELEASE_DATE = '2011-08-05 23:17:11 -0600'
|
metadata
CHANGED
|
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
|
|
|
6
6
|
- 4
|
|
7
7
|
- 6
|
|
8
8
|
- 3
|
|
9
|
-
-
|
|
10
|
-
version: 4.6.3.
|
|
9
|
+
- 3
|
|
10
|
+
version: 4.6.3.3
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Richard Dale
|
|
@@ -17,7 +17,7 @@ autorequire:
|
|
|
17
17
|
bindir: bin
|
|
18
18
|
cert_chain: []
|
|
19
19
|
|
|
20
|
-
date:
|
|
20
|
+
date: 2011-08-05 00:00:00 -06:00
|
|
21
21
|
default_executable:
|
|
22
22
|
dependencies: []
|
|
23
23
|
|