summaryrefslogtreecommitdiffstats
path: root/qtruby/rubylib
diff options
context:
space:
mode:
Diffstat (limited to 'qtruby/rubylib')
-rw-r--r--qtruby/rubylib/designer/uilib/Makefile.am2
-rw-r--r--qtruby/rubylib/qtruby/Makefile.am2
-rw-r--r--qtruby/rubylib/qtruby/Qt.cpp12
-rw-r--r--qtruby/rubylib/qtruby/configure.in.in2
-rw-r--r--qtruby/rubylib/qtruby/lib/Makefile.am2
-rw-r--r--qtruby/rubylib/qtruby/lib/Qt/Makefile.am2
6 files changed, 12 insertions, 10 deletions
diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
index e7f21bea..af91f64c 100644
--- a/qtruby/rubylib/designer/uilib/Makefile.am
+++ b/qtruby/rubylib/designer/uilib/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
-rubylibdir = $(RUBY_SITEARCHDIR)
+rubylibdir = $(RUBY_ARCHDIR)
rubylib_LTLIBRARIES = qui.la
qui_la_SOURCES = qui.cpp
qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am
index 1df273bf..156f80ac 100644
--- a/qtruby/rubylib/qtruby/Makefile.am
+++ b/qtruby/rubylib/qtruby/Makefile.am
@@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libqtrubyinternal.la
libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp
libqtrubyinternal_la_METASOURCES = AUTO
-rubylibdir = $(RUBY_SITEARCHDIR)
+rubylibdir = $(RUBY_ARCHDIR)
rubylib_LTLIBRARIES = qtruby.la
qtruby_la_SOURCES =
qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index a8415512..342863e6 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -950,7 +950,7 @@ cast_object_to(VALUE /*self*/, VALUE object, VALUE new_klass)
const char *
get_VALUEtype(VALUE ruby_value)
{
- char * classname = rb_obj_classname(ruby_value);
+ const char * classname = rb_obj_classname(ruby_value);
const char *r = "";
if(ruby_value == Qnil)
r = "u";
@@ -1395,7 +1395,7 @@ static Smoke::Index new_qvariant_qmap = 0;
}
static QCString *
-find_cached_selector(int argc, VALUE * argv, VALUE klass, char * methodName)
+find_cached_selector(int argc, VALUE * argv, VALUE klass, const char * methodName)
{
// Look in the cache
static QCString * mcid = 0;
@@ -1432,7 +1432,7 @@ static QCString * mcid = 0;
static VALUE
method_missing(int argc, VALUE * argv, VALUE self)
{
- char * methodName = rb_id2name(SYM2ID(argv[0]));
+ const char * methodName = rb_id2name(SYM2ID(argv[0]));
VALUE klass = rb_funcall(self, rb_intern("class"), 0);
// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
@@ -1482,7 +1482,7 @@ static QString * pred = 0;
VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
if (_current_method == -1) {
- char * op = rb_id2name(SYM2ID(argv[0]));
+ const char * op = rb_id2name(SYM2ID(argv[0]));
if ( qstrcmp(op, "-") == 0
|| qstrcmp(op, "+") == 0
|| qstrcmp(op, "/") == 0
@@ -1557,7 +1557,7 @@ static VALUE
class_method_missing(int argc, VALUE * argv, VALUE klass)
{
VALUE result = Qnil;
- char * methodName = rb_id2name(SYM2ID(argv[0]));
+ const char * methodName = rb_id2name(SYM2ID(argv[0]));
VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE));
temp_stack[0] = rb_str_new2("Qt");
temp_stack[1] = rb_str_new2(methodName);
@@ -1772,7 +1772,7 @@ qapplication_argv(VALUE /*self*/)
VALUE
getmetainfo(VALUE self, int &offset, int &index)
{
- char * signalname = rb_id2name(rb_frame_last_func());
+ const char * signalname = rb_id2name(rb_frame_last_func());
VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
smokeruby_object *ometa = value_obj_info(metaObject_value);
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index 41654f5e..453bb68d 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -7,12 +7,14 @@ else
RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
+ RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG])
AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR)
AC_SUBST(RUBY_SITEDIR)
+ AC_SUBST(RUBY_RUBYLIBDIR)
AC_SUBST(RUBY_LIBDIR)
AC_SUBST(RUBY_LIBRUBYARG)
fi
diff --git a/qtruby/rubylib/qtruby/lib/Makefile.am b/qtruby/rubylib/qtruby/lib/Makefile.am
index e8f6457a..b8298cb7 100644
--- a/qtruby/rubylib/qtruby/lib/Makefile.am
+++ b/qtruby/rubylib/qtruby/lib/Makefile.am
@@ -1,4 +1,4 @@
SUBDIRS = Qt
-rubylibdir = $(RUBY_SITEDIR)
+rubylibdir = $(RUBY_RUBYLIBDIR)
rubylib_DATA = Qt.rb
diff --git a/qtruby/rubylib/qtruby/lib/Qt/Makefile.am b/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
index 267582ef..b20eb92e 100644
--- a/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
+++ b/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
@@ -1,2 +1,2 @@
-qtrubylibdir = $(RUBY_SITEDIR)/Qt
+qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt
qtrubylib_DATA = qtruby.rb