qtbindings 4.8.5.2 → 4.8.6.0

data/ext/smoke/CMakeLists.txt

@@ -8,7 +8,9 @@ add_subdirectory(deptool)
 add_subdirectory(smokeapi)
 
 macro_optional_add_bindings(QT_QTNETWORK_FOUND "QtNetwork" qtnetwork)
-macro_optional_add_bindings(QT_QTDBUS_FOUND "QtDBus" qtdbus)
+if (NOT WIN32)
+  macro_optional_add_bindings(QT_QTDBUS_FOUND "QtDBus" qtdbus)
+endif (NOT WIN32)
 macro_optional_add_bindings(QT_QTDECLARATIVE_FOUND "QtDeclarative" qtdeclarative)
 macro_optional_add_bindings(QT_QTGUI_FOUND "QtGui" qtgui)
 macro_optional_add_bindings(QT_QTSVG_FOUND "QtSvg" qtsvg)

data/extconf.rb

@@ -1,6 +1,6 @@
 # Generates a Makefile that:
 # 1. Cleans up the build directory
-# 2. Runs cmake to build qtbind
+# 2. Runs cmake to build qtbindings
 # 3. Copies the built .so files into the correct places
 
 windows = false
@@ -9,21 +9,16 @@ processor, platform, *rest = RUBY_PLATFORM.split("-")
 windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
 macosx  = true if platform =~ /darwin/
 
-ruby_version_split = RUBY_VERSION.split('.')
-if ruby_version_split[0].to_i == 1
-  ruby_version = '1.9'
-  if ruby_version_split[1].to_i == 8
-    puts "Ruby 1.8.x is no longer supported. Install qtbindings 4.8.3.0. gem install qtbindings -v 4.8.3.0"
-    exit
-  end
-else
-  ruby_version = '2.0'
+ruby_version = RUBY_VERSION.split('.')[0..1].join('.')
+if ruby_version == "1.8"
+  puts "Ruby 1.8.x is no longer supported. Install qtbindings 4.8.3.0. gem install qtbindings -v 4.8.3.0"
+  exit
 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.5"
+  qt_sdk_path = "C:\\Qt\\4.8.6"
   begin
     File::Stat.new(qt_sdk_path)
   rescue
@@ -38,8 +33,7 @@ File.open('Makefile', 'w') do |file|
     file.puts ""
     file.puts "makedirs:"
     file.puts "\t-mkdir ext\\build"
-    file.puts "\t-mkdir bin\\1.9"
-    file.puts "\t-mkdir bin\\2.0"
+    file.puts "\t-mkdir bin\\#{ruby_version}"
     file.puts "\t-mkdir qtbin\\plugins"
     file.puts "\t-mkdir qtbin\\plugins\\accessible"
     file.puts "\t-mkdir qtbin\\plugins\\bearer"
@@ -51,8 +45,7 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-mkdir qtbin\\plugins\\phonon_backend"
     file.puts "\t-mkdir qtbin\\plugins\\qmltooling"
     file.puts "\t-mkdir qtbin\\plugins\\sqldrivers"
-    file.puts "\t-mkdir lib\\1.9"
-    file.puts "\t-mkdir lib\\2.0"
+    file.puts "\t-mkdir lib\\#{ruby_version}"
     file.puts ""
     file.puts "clean: makedirs"
     file.puts "\t-cd ext\\build && rmdir /S /Q CMakeFiles"
@@ -77,10 +70,8 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-cd qtbin\\plugins\\phonon_backend && del /F /Q *"
     file.puts "\t-cd qtbin\\plugins\\qmltooling && del /F /Q *"
     file.puts "\t-cd qtbin\\plugins\\sqldrivers && del /F /Q *"
-    file.puts "\t-cd bin\\1.9 && del /F /Q *"
-    file.puts "\t-cd bin\\2.0 && del /F /Q *"
-    file.puts "\t-cd lib\\1.9 && del /F /Q *"
-    file.puts "\t-cd lib\\2.0 && del /F /Q *"
+    file.puts "\t-cd bin\\#{ruby_version} && del /F /Q *"
+    file.puts "\t-cd lib\\#{ruby_version} && del /F /Q *"
     file.puts "\t-del /F /Q Makefile"
     file.puts "\t-del /F /Q qtbindings-*.gem"
     file.puts ""
@@ -95,32 +86,14 @@ File.open('Makefile', 'w') do |file|
     end
     file.puts "-DCMAKE_MAKE_PROGRAM=mingw32-make.exe \\"
     file.puts "-Wno-dev \\"
-    file.puts "-DENABLE_SMOKE=on \\"
-    file.puts "-DENABLE_QTCORE_SMOKE=on \\"
-    file.puts "-DENABLE_QTNETWORK_SMOKE=on \\"
-    file.puts "-DENABLE_QTDBUS_SMOKE=off \\"
-    file.puts "-DENABLE_QTGUI_SMOKE=on \\"
-    file.puts "-DENABLE_QTSVG_SMOKE=on \\"
-    file.puts "-DENABLE_QTSQL_SMOKE=on \\"
-    file.puts "-DENABLE_QTXML_SMOKE=on \\"
-    file.puts "-DENABLE_QTXMLPATTERNS_SMOKE=on \\"
-    file.puts "-DENABLE_QTOPENGL_SMOKE=on \\"
-    file.puts "-DENABLE_QTWEBKIT_SMOKE=on \\"
-    file.puts "-DENABLE_QTSCRIPT_SMOKE=on \\"
-    file.puts "-DENABLE_QTUITOOLS_SMOKE=on \\"
-    file.puts "-DENABLE_QTTEST_SMOKE=on \\"
-    file.puts "-DENABLE_QTMULTIMEDIA_SMOKE=on \\"
-    file.puts "-DENABLE_QTRUBY=on \\"
-    file.puts "-DENABLE_QTWEBKIT_RUBY=on \\"
-    file.puts "-DENABLE_QTUITOOLS_RUBY=on \\"
-    file.puts "-DENABLE_QTSCRIPT=on \\"
-    file.puts "-DENABLE_QTTEST=on \\"
+    file.puts "-DRUBY_EXECUTABLE=#{File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['RUBY_INSTALL_NAME'])} \\"
     file.puts ".."
     file.puts "\tcd ext\\build && mingw32-make"
     file.puts ""
     file.puts "install: makedirs"
     file.puts "\t-copy ext\\build\\smoke\\deptool\\smokedeptool.exe bin\\#{ruby_version}"
     file.puts "\t-copy ext\\build\\smoke\\qtcore\\libsmokeqtcore.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\smoke\\qtdeclarative\\libsmokeqtdeclarative.dll lib\\#{ruby_version}"
     file.puts "\t-copy ext\\build\\smoke\\qtgui\\libsmokeqtgui.dll lib\\#{ruby_version}"
     file.puts "\t-copy ext\\build\\smoke\\qthelp\\libsmokeqthelp.dll lib\\#{ruby_version}"
     file.puts "\t-copy ext\\build\\smoke\\qtmultimedia\\libsmokeqtmultimedia.dll lib\\#{ruby_version}"
@@ -137,6 +110,7 @@ File.open('Makefile', 'w') do |file|
     file.puts "\t-copy ext\\build\\smoke\\smokeapi\\smokeapi.exe bin\\#{ruby_version}"
     file.puts "\t-copy ext\\build\\smoke\\smokebase\\libsmokebase.dll lib\\#{ruby_version}"
     file.puts "\t-copy ext\\build\\ruby\\qtruby\\src\\libqtruby4shared.dll lib\\#{ruby_version}"
+    file.puts "\t-copy ext\\build\\ruby\\qtdeclarative\\qtdeclarative.dll lib\\#{ruby_version}\\qtdeclarative.so"
     file.puts "\t-copy ext\\build\\ruby\\qtruby\\src\\qtruby4.dll lib\\#{ruby_version}\\qtruby4.so"
     file.puts "\t-copy ext\\build\\ruby\\qtscript\\qtscript.dll lib\\#{ruby_version}\\qtscript.so"
     file.puts "\t-copy ext\\build\\ruby\\qttest\\qttest.dll lib\\#{ruby_version}\\qttest.so"
@@ -183,8 +157,7 @@ File.open('Makefile', 'w') do |file|
     file.puts ""
     file.puts "makedirs:"
     file.puts "\t-mkdir ext/build"
-    file.puts "\t-mkdir bin/1.9"
-    file.puts "\t-mkdir bin/2.0"
+    file.puts "\t-mkdir bin/#{ruby_version}"
     file.puts "\t-mkdir bin/plugins"
     file.puts "\t-mkdir bin/plugins/accessible"
     file.puts "\t-mkdir bin/plugins/bearer"
@@ -196,8 +169,7 @@ File.open('Makefile', 'w') do |file|
     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.9"
-    file.puts "\t-mkdir lib/2.0"
+    file.puts "\t-mkdir lib/#{ruby_version}"
     file.puts ""
     file.puts "clean: makedirs"
     file.puts "\t-cd ext/build; rm -rf CMakeFiles"
@@ -221,10 +193,8 @@ File.open('Makefile', 'w') do |file|
     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.9 && rm *"
-    file.puts "\t-cd bin/2.0 && rm *"
-    file.puts "\t-cd lib/1.9 && rm *"
-    file.puts "\t-cd lib/2.0 && rm *"
+    file.puts "\t-cd bin/#{ruby_version} && rm *"
+    file.puts "\t-cd lib/#{ruby_version} && rm *"
     file.puts "\t-rm Makefile"
     file.puts "\t-rm qtbindings-*.gem"
     file.puts ""
@@ -236,26 +206,7 @@ File.open('Makefile', 'w') do |file|
       file.puts "-DCMAKE_BUILD_TYPE=Debug \\"
     end
     file.puts "-Wno-dev \\"
-    file.puts "-DENABLE_SMOKE=on \\"
-    file.puts "-DENABLE_QTCORE_SMOKE=on \\"
-    file.puts "-DENABLE_QTNETWORK_SMOKE=on \\"
-    file.puts "-DENABLE_QTDBUS_SMOKE=on \\"
-    file.puts "-DENABLE_QTGUI_SMOKE=on \\"
-    file.puts "-DENABLE_QTSVG_SMOKE=on \\"
-    file.puts "-DENABLE_QTSQL_SMOKE=on \\"
-    file.puts "-DENABLE_QTXML_SMOKE=on \\"
-    file.puts "-DENABLE_QTXMLPATTERNS_SMOKE=on \\"
-    file.puts "-DENABLE_QTOPENGL_SMOKE=on \\"
-    file.puts "-DENABLE_QTWEBKIT_SMOKE=on \\"
-    file.puts "-DENABLE_QTSCRIPT_SMOKE=on \\"
-    file.puts "-DENABLE_QTUITOOLS_SMOKE=on \\"
-    file.puts "-DENABLE_QTTEST_SMOKE=on \\"
-    file.puts "-DENABLE_QTMULTIMEDIA_SMOKE=on \\"
-    file.puts "-DENABLE_QTRUBY=on \\"
-    file.puts "-DENABLE_QTWEBKIT_RUBY=on \\"
-    file.puts "-DENABLE_QTUITOOLS_RUBY=on \\"
-    file.puts "-DENABLE_QTSCRIPT=on \\"
-    file.puts "-DENABLE_QTTEST=on \\"
+    file.puts "-DRUBY_EXECUTABLE=#{File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['RUBY_INSTALL_NAME'])} \\"
     file.puts ".."
     file.puts "\tcd ext/build; make"
     file.puts ""
@@ -263,6 +214,7 @@ File.open('Makefile', 'w') do |file|
     if macosx
       file.puts "\t-cp ext/build/smoke/smokeapi/smokeapi bin/#{ruby_version}"
       file.puts "\t-cp ext/build/smoke/deptool/smokedeptool bin/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtdeclarative/qtdeclarative.so lib/#{ruby_version}/qtdeclarative.bundle"
       file.puts "\t-cp ext/build/ruby/qtruby/src/qtruby4.so lib/#{ruby_version}/qtruby4.bundle"
       file.puts "\t-cp ext/build/ruby/qtscript/qtscript.* lib/#{ruby_version}/qtscript.bundle"
       file.puts "\t-cp ext/build/ruby/qttest/qttest.* lib/#{ruby_version}/qttest.bundle"
@@ -274,6 +226,7 @@ File.open('Makefile', 'w') do |file|
       file.puts "\t-cp ext/build/smoke/deptool/smokedeptool bin/#{ruby_version}"
       file.puts "\t-cp ext/build/smoke/qtcore/libsmokeqtcore.* lib/#{ruby_version}"
       file.puts "\t-cp ext/build/smoke/qtdbus/libsmokeqtdbus.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/smoke/qtdeclarative/libsmokeqtdeclarative.* lib/#{ruby_version}"
       file.puts "\t-cp ext/build/smoke/qtgui/libsmokeqtgui.* lib/#{ruby_version}"
       file.puts "\t-cp ext/build/smoke/qthelp/libsmokeqthelp.* lib/#{ruby_version}"
       file.puts "\t-cp ext/build/smoke/qtmultimedia/libsmokeqtmultimedia.* lib/#{ruby_version}"
@@ -289,6 +242,7 @@ File.open('Makefile', 'w') do |file|
       file.puts "\t-cp ext/build/smoke/qtxmlpatterns/libsmokeqtxmlpatterns.* lib/#{ruby_version}"
       file.puts "\t-cp ext/build/smoke/smokeapi/smokeapi bin/#{ruby_version}"
       file.puts "\t-cp ext/build/smoke/smokebase/libsmokebase.* lib/#{ruby_version}"
+      file.puts "\t-cp ext/build/ruby/qtdeclarative/qtdeclarative.* lib/#{ruby_version}"
       file.puts "\t-cp ext/build/ruby/qtruby/src/libqtruby4shared.* lib/#{ruby_version}"
       file.puts "\t-cp ext/build/ruby/qtruby/src/qtruby4.* lib/#{ruby_version}"
       file.puts "\t-cp ext/build/ruby/qtscript/qtscript.* lib/#{ruby_version}"

data/lib/Qt/qtruby4.rb

@@ -476,10 +476,11 @@ module Qt
     # Otherwise, rb_gc_call_finalizer_at_exit() can delete
     # stuff that Qt::Application still needs for its cleanup.
     def exec
-      method_missing(:exec)
+      result = method_missing(:exec)
       disable_threading()
       self.dispose
       Qt::Internal.application_terminated = true
+      result
     end
 
     def type(*args)

data/lib/Qt4.rb

@@ -3,24 +3,18 @@ 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
 
-if RUBY_VERSION.split('.')[0].to_i == 1
-  if windows
-    ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + File.join(File.dirname(__FILE__), '../lib/1.9') + ';' + File.join(File.dirname(__FILE__), '../bin/1.9') + ';' + ENV['PATH']
-  end
-  $: << File.join(File.dirname(__FILE__), '../lib/1.9')
-  require '1.9/qtruby4'
-else
-  if windows
-    ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + File.join(File.dirname(__FILE__), '../lib/2.0') + ';' + File.join(File.dirname(__FILE__), '../bin/2.0') + ';' + ENV['PATH']
-  end
-  $: << File.join(File.dirname(__FILE__), '../lib/2.0')
-  require '2.0/qtruby4'
+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
@@ -83,7 +77,20 @@ module Qt
     end
   end
 
-  def self.execute_in_main_thread (blocking = false, sleep_period = 0.001, delay_execution = false)
+  # 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}

data/lib/qtbindings_version.rb

@@ -1,2 +1,2 @@
-QTBINDINGS_VERSION = '4.8.5.2'
-QTBINDINGS_RELEASE_DATE = '2014-01-07 11:22:07 -0700'
+QTBINDINGS_VERSION = '4.8.6.0'
+QTBINDINGS_RELEASE_DATE = '2014-09-23 20:58:11 -0600'

data/lib/qtdeclarative/qtdeclarative.rb

@@ -0,0 +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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qtbindings
 version: !ruby/object:Gem::Version
-  version: 4.8.5.2
+  version: 4.8.6.0
 platform: ruby
 authors:
 - Ryan Melton
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies: []
 description: qtbindings provides ruby bindings to QT4.x. It is derived from the kdebindings
   project.
@@ -26,21 +26,18 @@ extensions:
 - extconf.rb
 extra_rdoc_files: []
 files:
-- lib/Qt/qtruby4.rb
-- lib/Qt.rb
-- lib/Qt4.rb
-- lib/qtbindings_version.rb
-- lib/qtscript/qtscript.rb
-- lib/qttest/qttest.rb
-- lib/qtuitools/qtuitools.rb
-- lib/qtwebkit/qtwebkit.rb
+- CHANGELOG.txt
+- COPYING.LIB.txt
+- COPYING.txt
+- KNOWN_ISSUES.txt
+- README.txt
+- Rakefile
+- TODO.txt
 - bin/rbqtapi
 - bin/rbrcc
 - bin/rbuic4
 - bin/smokeapi
 - bin/smokedeptool
-- examples/base/kicons.rb
-- examples/base/rui.rb
 - examples/designer/calculatorbuilder/calculatorbuilder.qrc
 - examples/designer/calculatorbuilder/calculatorform.rb
 - examples/designer/calculatorbuilder/calculatorform.ui
@@ -120,8 +117,8 @@ files:
 - examples/itemviews/chart/qtdata.cht
 - examples/itemviews/dirview/main.rb
 - examples/itemviews/pixelator/imagemodel.rb
-- examples/itemviews/pixelator/images/qt.png
 - examples/itemviews/pixelator/images.qrc
+- examples/itemviews/pixelator/images/qt.png
 - examples/itemviews/pixelator/main.rb
 - examples/itemviews/pixelator/mainwindow.rb
 - examples/itemviews/pixelator/makefile
@@ -291,12 +288,13 @@ files:
 - examples/richtext/syntaxhighlighter/highlighter.rb
 - examples/richtext/syntaxhighlighter/main.rb
 - examples/richtext/syntaxhighlighter/mainwindow.rb
-- examples/ruboids/boids.properties
-- examples/ruboids/generateManifest.rb
-- examples/ruboids/index.html
 - examples/ruboids/LICENSE.txt
 - examples/ruboids/Manifest
 - examples/ruboids/README
+- examples/ruboids/TODO
+- examples/ruboids/boids.properties
+- examples/ruboids/generateManifest.rb
+- examples/ruboids/index.html
 - examples/ruboids/release.rb
 - examples/ruboids/ruboids/Boid.rb
 - examples/ruboids/ruboids/BoidView.rb
@@ -307,18 +305,17 @@ files:
 - examples/ruboids/ruboids/CloudView.rb
 - examples/ruboids/ruboids/Flock.rb
 - examples/ruboids/ruboids/Graphics.rb
-- examples/ruboids/ruboids/info.rb
 - examples/ruboids/ruboids/Params.rb
 - examples/ruboids/ruboids/Point.rb
-- examples/ruboids/ruboids/ruboids.rb
 - examples/ruboids/ruboids/Thing.rb
 - examples/ruboids/ruboids/Triangle.rb
 - examples/ruboids/ruboids/View.rb
 - examples/ruboids/ruboids/World.rb
 - examples/ruboids/ruboids/WorldWindow.rb
-- examples/ruboids/TODO
+- examples/ruboids/ruboids/info.rb
+- examples/ruboids/ruboids/ruboids.rb
 - examples/run_all.rb
-- examples/textedit/textedit.rb
+- examples/threading/main_thread.rb
 - examples/tutorial/t1/t1.rb
 - examples/tutorial/t10/cannon.rb
 - examples/tutorial/t10/lcdrange.rb
@@ -430,17 +427,18 @@ files:
 - examples/xml/saxbookmarks/mainwindow.rb
 - examples/xml/saxbookmarks/xbelgenerator.rb
 - examples/xml/saxbookmarks/xbelhandler.rb
+- ext/CMakeLists.txt
 - ext/cmake/modules/BasicFindPackageVersion.cmake.in
-- ext/cmake/modules/CheckCXXSourceCompiles.cmake
 - ext/cmake/modules/CMakeCSharpCompiler.cmake.in
 - ext/cmake/modules/CMakeCSharpInformation.cmake
 - ext/cmake/modules/CMakeDetermineCSharpCompiler.cmake
 - ext/cmake/modules/CMakeTestCSharpCompiler.cmake
+- ext/cmake/modules/CheckCXXSourceCompiles.cmake
 - ext/cmake/modules/FindLibraryWithDebug.cmake
 - ext/cmake/modules/FindMono.cmake
+- ext/cmake/modules/FindPHP5.cmake
 - ext/cmake/modules/FindPerlMore.cmake
 - ext/cmake/modules/FindPhonon.cmake
-- ext/cmake/modules/FindPHP5.cmake
 - ext/cmake/modules/FindQImageBlitz.cmake
 - ext/cmake/modules/FindQScintilla.cmake
 - ext/cmake/modules/FindQt4.cmake
@@ -456,7 +454,7 @@ files:
 - ext/cmake/modules/Qt4ConfigDependentSettings.cmake
 - ext/cmake/modules/Qt4Macros.cmake
 - ext/cmake/modules/SmokeConfig.cmake.in
-- ext/CMakeLists.txt
+- ext/generator/CMakeLists.txt
 - ext/generator/cmake/BasicFindPackageVersion.cmake.in
 - ext/generator/cmake/CMakeLists.txt
 - ext/generator/cmake/FindLibraryWithDebug.cmake
@@ -470,7 +468,6 @@ files:
 - ext/generator/cmake/MacroOptionalFindPackage.cmake
 - ext/generator/cmake/MacroWriteBasicCMakeVersionFile.cmake
 - ext/generator/cmake/SmokeConfig.cmake.in
-- ext/generator/CMakeLists.txt
 - ext/generator/config.h
 - ext/generator/generator_export.h
 - ext/generator/generatorenvironment.cpp
@@ -493,10 +490,10 @@ files:
 - ext/generator/name_compiler.h
 - ext/generator/options.cpp
 - ext/generator/options.h
+- ext/generator/parser/CMakeLists.txt
 - ext/generator/parser/ast.cpp
 - ext/generator/parser/ast.h
 - ext/generator/parser/astutilities.h
-- ext/generator/parser/CMakeLists.txt
 - ext/generator/parser/codegenerator.cpp
 - ext/generator/parser/codegenerator.h
 - ext/generator/parser/codemodel_fwd.h
@@ -528,14 +525,14 @@ files:
 - ext/generator/parser/parsesession.cpp
 - ext/generator/parser/parsesession.h
 - ext/generator/parser/problem.h
+- ext/generator/parser/rpp/CMakeLists.txt
+- ext/generator/parser/rpp/Makefile.am
 - ext/generator/parser/rpp/anchor.h
 - ext/generator/parser/rpp/appendedlist.h
 - ext/generator/parser/rpp/chartools.cpp
 - ext/generator/parser/rpp/chartools.h
-- ext/generator/parser/rpp/CMakeLists.txt
 - ext/generator/parser/rpp/macrorepository.cpp
 - ext/generator/parser/rpp/macrorepository.h
-- ext/generator/parser/rpp/Makefile.am
 - ext/generator/parser/rpp/pp-configuration
 - ext/generator/parser/rpp/pp-engine.cpp
 - ext/generator/parser/rpp/pp-engine.h
@@ -601,18 +598,20 @@ files:
 - ext/ruby/qtdeclarative/qtdeclarative.rb
 - ext/ruby/qtdeclarative/qtdeclarativehandlers.cpp
 - ext/ruby/qtruby/AUTHORS
-- ext/ruby/qtruby/bin/CMakeLists.txt
-- ext/ruby/qtruby/bin/rbqtapi
-- ext/ruby/qtruby/ChangeLog
 - ext/ruby/qtruby/CMakeLists.txt
 - ext/ruby/qtruby/COPYING
 - ext/ruby/qtruby/COPYING.LIB
+- ext/ruby/qtruby/ChangeLog
 - ext/ruby/qtruby/INSTALL
+- ext/ruby/qtruby/README
+- ext/ruby/qtruby/TODO
+- ext/ruby/qtruby/bin/CMakeLists.txt
+- ext/ruby/qtruby/bin/rbqtapi
+- ext/ruby/qtruby/rails_support/CMakeLists.txt
 - ext/ruby/qtruby/rails_support/active_item_model.rb
 - ext/ruby/qtruby/rails_support/active_table_model.rb
-- ext/ruby/qtruby/rails_support/CMakeLists.txt
-- ext/ruby/qtruby/README
 - ext/ruby/qtruby/src/CMakeLists.txt
+- ext/ruby/qtruby/src/Qt.cpp
 - ext/ruby/qtruby/src/handlers.cpp
 - ext/ruby/qtruby/src/marshall.h
 - ext/ruby/qtruby/src/marshall_basetypes.h
@@ -621,21 +620,22 @@ files:
 - ext/ruby/qtruby/src/marshall_primitives.h
 - ext/ruby/qtruby/src/marshall_types.cpp
 - ext/ruby/qtruby/src/marshall_types.h
-- ext/ruby/qtruby/src/Qt.cpp
 - ext/ruby/qtruby/src/qtruby.cpp
 - ext/ruby/qtruby/src/qtruby.h
 - ext/ruby/qtruby/src/smokeruby.h
 - ext/ruby/qtruby/test/opoverloading.rb
 - ext/ruby/qtruby/test/unittests.rb
-- ext/ruby/qtruby/TODO
 - ext/ruby/qtruby/tools/CMakeLists.txt
 - ext/ruby/qtruby/tools/rbrcc/CMakeLists.txt
-- ext/ruby/qtruby/tools/rbrcc/main.cpp
 - ext/ruby/qtruby/tools/rbrcc/Messages.sh
+- ext/ruby/qtruby/tools/rbrcc/main.cpp
 - ext/ruby/qtruby/tools/rbrcc/rbrcc.pro
 - ext/ruby/qtruby/tools/rbrcc/rcc.cpp
 - ext/ruby/qtruby/tools/rbrcc/rcc.h
 - ext/ruby/qtruby/tools/rbuic/CMakeLists.txt
+- ext/ruby/qtruby/tools/rbuic/LICENSE.GPL
+- ext/ruby/qtruby/tools/rbuic/Messages.sh
+- ext/ruby/qtruby/tools/rbuic/TODO
 - ext/ruby/qtruby/tools/rbuic/customwidgetsinfo.cpp
 - ext/ruby/qtruby/tools/rbuic/customwidgetsinfo.h
 - ext/ruby/qtruby/tools/rbuic/databaseinfo.cpp
@@ -643,9 +643,7 @@ files:
 - ext/ruby/qtruby/tools/rbuic/driver.cpp
 - ext/ruby/qtruby/tools/rbuic/driver.h
 - ext/ruby/qtruby/tools/rbuic/globaldefs.h
-- ext/ruby/qtruby/tools/rbuic/LICENSE.GPL
 - ext/ruby/qtruby/tools/rbuic/main.cpp
-- ext/ruby/qtruby/tools/rbuic/Messages.sh
 - ext/ruby/qtruby/tools/rbuic/option.h
 - ext/ruby/qtruby/tools/rbuic/rbuic.pri
 - ext/ruby/qtruby/tools/rbuic/rbuic4.pro
@@ -662,7 +660,6 @@ files:
 - ext/ruby/qtruby/tools/rbuic/ruby/rbwriteinitialization.cpp
 - ext/ruby/qtruby/tools/rbuic/ruby/rbwriteinitialization.h
 - ext/ruby/qtruby/tools/rbuic/ruby/ruby.pri
-- ext/ruby/qtruby/tools/rbuic/TODO
 - ext/ruby/qtruby/tools/rbuic/treewalker.cpp
 - ext/ruby/qtruby/tools/rbuic/treewalker.h
 - ext/ruby/qtruby/tools/rbuic/ui4.cpp
@@ -677,8 +674,8 @@ files:
 - ext/ruby/qtscript/qtscript.rb
 - ext/ruby/qtscript/qtscripthandlers.cpp
 - ext/ruby/qtscript/smokedata.cpp
-- ext/ruby/qttest/ChangeLog
 - ext/ruby/qttest/CMakeLists.txt
+- ext/ruby/qttest/ChangeLog
 - ext/ruby/qttest/examples/myfirsttest.rb
 - ext/ruby/qttest/qttest.cpp
 - ext/ruby/qttest/qttest.rb
@@ -696,10 +693,10 @@ files:
 - ext/smoke/deptool/main.cpp
 - ext/smoke/qt_smoke.h
 - ext/smoke/qtcore/CMakeLists.txt
+- ext/smoke/qtcore/QtGuess.txt
 - ext/smoke/qtcore/config.xml.cmake
 - ext/smoke/qtcore/qt-config.xml.cmake
 - ext/smoke/qtcore/qtcore_includes.h
-- ext/smoke/qtcore/QtGuess.txt
 - ext/smoke/qtcore/smokeconfig.xml
 - ext/smoke/qtcore/tests/CMakeLists.txt
 - ext/smoke/qtcore/tests/test.cpp
@@ -785,18 +782,17 @@ files:
 - ext/smoke/smokebase/CMakeLists.txt
 - ext/smoke/smokebase/smokebase.cpp
 - ext/smoke/solid_smoke.h
-- CHANGELOG.txt
-- CMakeLists.txt
-- COPYING.LIB.txt
-- COPYING.txt
-- KNOWN_ISSUES.txt
-- README.txt
-- TODO.txt
 - extconf.rb
-- qtbindings-qt.gemspec
+- lib/Qt.rb
+- lib/Qt/qtruby4.rb
+- lib/Qt4.rb
+- lib/qtbindings_version.rb
+- lib/qtdeclarative/qtdeclarative.rb
+- lib/qtscript/qtscript.rb
+- lib/qttest/qttest.rb
+- lib/qtuitools/qtuitools.rb
+- lib/qtwebkit/qtwebkit.rb
 - qtbindings.gemspec
-- qtbindingsnative.gemspec
-- Rakefile
 homepage: http://github.com/ryanmelt/qtbindings
 licenses:
 - LGPLv2.1
@@ -807,18 +803,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: qtbindings
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Qt bindings for ruby