From ae3f95170046f4f2456daa046c826c036cd2a8f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 1 Jan 2012 19:41:15 -0600 Subject: Use smoketqt --- PerlTQt/INSTALL | 8 ++++---- PerlTQt/Makefile.PL.in | 4 ++-- PerlTQt/TQt.xs | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'PerlTQt') diff --git a/PerlTQt/INSTALL b/PerlTQt/INSTALL index bad4e4a..b243233 100644 --- a/PerlTQt/INSTALL +++ b/PerlTQt/INSTALL @@ -21,7 +21,7 @@ Make sure your $TQTDIR environment-variable is set. I'm sorry for all the requirements, but you *are* getting this from CVS. Release versions will be much easier and more independant. -First, you need to download the development environment for smokeqt. +First, you need to download the development environment for smoketqt. Please use compression for cvs downloads ('cvs -z4' in .cvsrc). $ export CVSROOT=:pserver:anonymous@anoncvs.kde.org:/home/kde @@ -32,7 +32,7 @@ $ cvs co kdebindings/smoke # pre-generated smoke library $ cd kdebindings # kdebindings/ $ cvs co admin # get kde build tools -At this point, you now have the full smokeqt environment. The +At this point, you now have the full smoketqt environment. The pre-generated smoke library is based off KDE's copy of TQt-3.0.4. I have TQt-3.0.1, so I have to re-generate the files to match my installed version of TQt. Here's how to do it. @@ -51,7 +51,7 @@ $ cd smoke # kdebindings/smoke/ $ make # this should succeed $ make install # will install to --prefix from configure -Okay, you now have libsmokeqt installed on your system. You can now +Okay, you now have libsmoketqt installed on your system. You can now compile PerlTQt. First, get the latest version of PerlTQt-3. $ export CVSROOT=:pserver:anonymous@cvs.perlqt.sf.net:/cvsroot/perlqt @@ -59,7 +59,7 @@ $ cvs login # no password $ cvs co PerlTQt-3 $ cd PerlTQt-3 # PerlTQt-3/ -If you installed libsmokeqt in a non-standard library path, you will +If you installed libsmoketqt in a non-standard library path, you will need to edit Makefile.PL and add -L/your/lib/path to the LIBS parameter. If any of the other options in Makefile.PL need changing for your system, you will need to change it now. diff --git a/PerlTQt/Makefile.PL.in b/PerlTQt/Makefile.PL.in index 7746d30..bcf72af 100644 --- a/PerlTQt/Makefile.PL.in +++ b/PerlTQt/Makefile.PL.in @@ -85,7 +85,7 @@ WriteMakefile( 'VERSION_FROM' => 'TQt.pm', # finds $VERSION 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1, 'INC' => '@all_includes@ -I. -I../smoke', - 'LIBS' => ['@all_libraries@'." -L$localsmoke -lsmokeqt ".'@LIBCRYPT@'." $qtlib"], + 'LIBS' => ['@all_libraries@'." -L$localsmoke -lsmoketqt ".'@LIBCRYPT@'." $qtlib"], # 'XS' => {'TQt.xs' => 'TQt.cpp'}, # does not work ... still expects TQt.c 'XSOPT' => "-C++", 'OBJECT' => "$objects", # Object files @@ -116,7 +116,7 @@ sub MY::const_loadlibs { package MY; my $i = shift->SUPER::const_loadlibs(@_); # hacks for linking against a non-yet-installed smoke - $i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmokeqt\n/gs unless $i =~/-lsmokeqt/; + $i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmoketqt\n/gs unless $i =~/-lsmoketqt/; $i =~ s#(LD_RUN_PATH.*?)(${localsmoke})?\n#"$1".($2?"":":")."$x{'libdir'}\n"#se; $i; } diff --git a/PerlTQt/TQt.xs b/PerlTQt/TQt.xs index 22a66de..5408d0b 100644 --- a/PerlTQt/TQt.xs +++ b/PerlTQt/TQt.xs @@ -442,7 +442,7 @@ public: static_TQUType_int.set(po, si->s_int); break; case xmoc_double: - static_TQUType_double.set(po, si->s_double); + static_QUType_double.set(po, si->s_double); break; case xmoc_charstar: static_TQUType_charstar.set(po, (char*)si->s_voidp); @@ -567,7 +567,7 @@ public: _stack[i].s_int = static_TQUType_int.get(o); break; case xmoc_double: - _stack[i].s_double = static_TQUType_double.get(o); + _stack[i].s_double = static_QUType_double.get(o); break; case xmoc_charstar: _stack[i].s_voidp = static_TQUType_charstar.get(o); @@ -1638,7 +1638,7 @@ make_TQUParameter(name, type, extra, inout) else if(!strcmp(type, "int")) p->type = &static_TQUType_int; else if(!strcmp(type, "double")) - p->type = &static_TQUType_double; + p->type = &static_QUType_double; else if(!strcmp(type, "char*") || !strcmp(type, "const char*")) p->type = &static_TQUType_charstar; else if(!strcmp(type, "TQString") || !strcmp(type, "TQString&") || -- cgit v1.2.3