From kde-commits  Tue Oct 31 15:21:35 2006
From: Caleb Tennis <caleb () gentoo ! org>
Date: Tue, 31 Oct 2006 15:21:35 +0000
To: kde-commits
Subject: KDE/kdebindings/qtruby/rubylib/qtruby/lib
Message-Id: <1162308095.422542.14695.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=116230820923444

SVN commit 600729 by ctennis:

A small change to the Qt3 and Qt4 files to prevent someone from trying to load both
libraries at the same time (which causes ruby to crash).

CCMAIL: kde-bindings@kde.org



 M  +6 -1      Qt3.rb  
 M  +6 -1      Qt4.rb  


--- trunk/KDE/kdebindings/qtruby/rubylib/qtruby/lib/Qt3.rb #600728:600729
@@ -1 +1,6 @@
-require 'qtruby'
+begin
+  version = Qt::version
+  raise LoadError.new("Qt4 already loaded") unless version =~ /^3/
+rescue NameError
+  require 'qtruby'
+end
--- trunk/KDE/kdebindings/qtruby/rubylib/qtruby/lib/Qt4.rb #600728:600729
@@ -1 +1,6 @@
-require 'qtruby4'
+begin
+  version = Qt::version
+  raise LoadError.new("Qt3 already loaded") unless version =~ /^4/
+rescue NameError
+  require 'qtruby4'
+end