RPM Packaging: lot of R14 packages

12 files changed, 501 insertions, 962 deletions

diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index febebfc68..2e09f82b3 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -29,7 +29,7 @@ Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	gcc-c++
 BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqt3-devel >= %{version}
+BuildRequires:	trinity-tqt3-devel >= 3.5.0
 BuildRequires:	trinity-tqtinterface-devel >= %{version}
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
@@ -57,7 +57,7 @@ BuildRequires:	expat-devel
 %endif
 %endif
 
-Requires:		trinity-tqt3 >= %{version}
+Requires:		trinity-tqt3 >= 3.5.0
 Requires:		trinity-tqtinterface >= %{version}
 
 Obsoletes:		avahi-tqt < %{version}-%{release}
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index c8175b29a..ef6247ec4 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -1,5 +1,6 @@
 # Always install under standard prefix
 %define tde_prefix /usr
+%define tde_version 14.0.0
 
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
@@ -33,13 +34,26 @@ BuildRequires:	trinity-tqtinterface-devel >= %{version}
 
 # TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqt3-devel >= %{version}
-Requires:		trinity-tqt3 >= %{version}
+BuildRequires:	trinity-tqt3-devel >= 3.5.0
+Requires:		trinity-tqt3 >= 3.5.0
 
 
 %description
 Dbus TQT Interface
 
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/dbusxml2qt3
+%{tde_libdir}/libdbus-1-tqt.so.0
+%{tde_libdir}/libdbus-1-tqt.so.0.0.0
+
+##########
 
 %package devel
 Requires:	%{name}
@@ -52,6 +66,21 @@ Provides:		dbus-1-tqt-devel = %{version}-%{release}
 %description devel
 Development files for %{name}
 
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/*.h
+%{tde_libdir}/libdbus-1-tqt.so
+%{tde_libdir}/libdbus-1-tqt.la
+%{tde_libdir}/pkgconfig/*.pc
+
+##########
+
 %if 0%{?suse_version} || 0%{?pclinuxos}
 %debug_package
 %endif
@@ -83,33 +112,10 @@ cd build
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
 
+
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/libdbus-1-tqt.so.0
-%{tde_libdir}/libdbus-1-tqt.so.0.0.0
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*.h
-%{tde_libdir}/libdbus-1-tqt.so
-%{tde_libdir}/libdbus-1-tqt.la
-%{tde_libdir}/pkgconfig/*.pc
 
 %changelog
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index b8acfe94d..642ffee80 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -32,9 +32,9 @@ BuildRequires:	trinity-tqtinterface-devel >= %{version}
 
 # TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqt3-devel >= %{version}
+BuildRequires:	trinity-tqt3-devel >= 3.5.0
 
-Requires:		trinity-tqt3 >= %{version}
+Requires:		trinity-tqt3 >= 3.5.0
 
 Obsoletes:		dbus-tqt < %{version}-%{release}
 Provides:		dbus-tqt = %{version}-%{release}
@@ -43,6 +43,18 @@ Provides:		dbus-tqt = %{version}-%{release}
 %description
 Dbus TQT Interface
 
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%files
+%defattr(-,root,root,-)
+%{tde_libdir}/libdbus-tqt-1.so.0
+%{tde_libdir}/libdbus-tqt-1.so.0.0.0
+
+##########
 
 %package devel
 Requires:		%{name}
@@ -55,6 +67,20 @@ Provides:		dbus-tqt-devel = %{version}-%{release}
 %description devel
 Development files for %{name}
 
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/dbus-1.0/*
+%{tde_libdir}/libdbus-tqt-1.so
+%{tde_libdir}/libdbus-tqt-1.la
+%{tde_libdir}/pkgconfig/dbus-tqt.pc
+
+##########
 
 %if 0%{?suse_version} || 0%{?pclinuxos}
 %debug_package
@@ -70,7 +96,7 @@ Development files for %{name}
 
 
 %build
-unset QTDIR
+unset QTDIR QTINC QTLIB
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 %if 0%{?rhel} == 4
@@ -94,32 +120,10 @@ cd build
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
 
+
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/libdbus-tqt-1.so.0
-%{tde_libdir}/libdbus-tqt-1.so.0.0.0
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/libdbus-tqt-1.so
-%{tde_libdir}/libdbus-tqt-1.la
-%{tde_libdir}/pkgconfig/dbus-tqt.pc
 
 %changelog
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index 108a9214b..17544e1eb 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -31,8 +31,8 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:  trinity-tqt3-devel >= %{version}
-BuildRequires:  trinity-tqtinterface-devel >= %{version}
+BuildRequires:  trinity-tqt3-devel >= 3.5.0
+BuildRequires:  trinity-tqtinterface-devel >= 3.5.0
 
 %description
 A library of functions for 2D graphics supporting a superset of the
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch b/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch
new file mode 100644
index 000000000..7716f3597
--- /dev/null
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch
@@ -0,0 +1,11 @@
+--- trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip.ORI	2013-07-03 20:23:06.054830311 +0200
++++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip	2013-07-03 20:23:14.833911835 +0200
+@@ -2196,7 +2196,7 @@
+     // See if it is a TQt signal.
+     if (*sig == '2')
+     {
+-        pyqt3TQtSignal *tab;
++        pyqt3QtSignal *tab;
+ 
+         // Search the table.
+         for (tab = ((pyqt3ClassTypeDef *)((sipWrapperType *)(self->ob_type))->type)->qt3_emit; tab->st_name != NULL; ++tab)
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
new file mode 100644
index 000000000..d84be561c
--- /dev/null
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -0,0 +1,172 @@
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define tde_version 14.0.0
+
+# Always install under standard prefix
+%define tde_prefix /usr
+
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name:		trinity-python-tqt
+Version:	3.18.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+License:	GPL
+
+Summary:	TQt bindings for Python
+Group:		System Environment/Libraries
+
+Obsoletes:		trinity-PyQt
+Obsoletes:		trinity-python-qt3
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0:		python-tqt-14.0.0-ftbfs.patch
+
+BuildRequires:	gcc-c++
+BuildRequires:	python-sip
+BuildRequires:	trinity-tqtinterface-devel >= %{version}
+BuildRequires:	trinity-tqscintilla-devel
+
+# TDE specific building variables
+BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-tqt3-devel >= 3.5.0
+Requires:		trinity-tqt3 >= 3.5.0
+
+
+%description
+Python binding module that allows use of TQt X Window toolkit v3.
+You can use it to create portable graphics-capable scripts (there
+are PyQt versions for Linux, Windows and MacOS X).
+
+At this moment PyQt offers a vast subset of TQt API. There are
+some minor issues related to the differences between C++ and Python
+(types, etc), but usually you'll be able to write code pretty much the
+same way in both languages (with syntax differences, of course)
+
+%files
+%defattr(-,root,root,-)
+%doc NEWS README
+%{python_sitearch}/qt.so
+%{python_sitearch}/qtcanvas.so
+%{python_sitearch}/qtnetwork.so
+%{python_sitearch}/qtsql.so
+%{python_sitearch}/qttable.so
+%{python_sitearch}/qtui.so
+%{python_sitearch}/qtxml.so
+
+##########
+
+%package gl
+Summary:	TQt OpenGL bindings for Python
+Requires:	%{name} = %{version}-%{release}
+
+%description gl
+Python binding module that allows use of the OpenGL facilities
+offered by the TQt X Window toolkit v3. You can use it to create
+portable graphics-capable scripts (there are PyQt versions for
+Linux, Windows and MacOS X).
+
+%files gl
+%defattr(-,root,root,-)
+%{python_sitearch}/qtgl.so
+
+##########
+
+%package tqtext
+Summary:	TQt extensions for PyQt
+Requires:	%{name} = %{version}-%{release}
+
+%description tqtext
+PyQt Extensions. Contains:
+
+* QScintilla: a featureful TQt source code editing component based
+              on Scintilla.
+
+%files tqtext
+%defattr(-,root,root,-)
+%{python_sitearch}/qtext.so
+
+##########
+
+%package -n trinity-pytqt-tools
+Summary:	pyuic and pylupdate for TQt
+
+%description -n trinity-pytqt-tools
+pyuic is the PyQt counterpart for TQt's uic. It takes an XML
+user interface file and generates Python code.
+
+pylupdate is the counterpart for TQt's lupdate. It updates TQt
+Linguist translation files from Python code.
+
+%files -n trinity-pytqt-tools
+%{_bindir}/pylupdate
+%{_bindir}/pyuic
+
+##########
+
+%package devel
+Summary:	TQt bindings for Python - Development files
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+Development .sip files with definitions of PyQt classes. They
+are needed to build PyQt, but also as building blocks of other
+packages based on them, like PyKDE.
+
+%files devel
+%defattr(-,root,root,-)
+%{python_sitearch}/pyqtconfig.py
+%{_datadir}/sip/tqt/
+
+##########
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
+
+%build
+unset QTDIR QTINC QTLIB
+
+mkdir build
+cd build
+echo yes | python ../configure.py \
+	-c -n %{_includedir}/tqscintilla \
+	-q /usr/share/tqt3 \
+	-y tqt-mt \
+	-o %{_libdir} -u -j 10 \
+	-d %{python_sitearch} \
+	-v %{_datadir}/sip/tqt \
+	-w \
+	CXXFLAGS_RELEASE="" CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt" STRIP=""
+
+%__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%__install -d %{?buildroot}%{_datadir}/sip/
+%__cp -rf sip/* %{?buildroot}%{_datadir}/sip/tqt/
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+
+%changelog
+* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch
new file mode 100644
index 000000000..0323dee9c
--- /dev/null
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch
@@ -0,0 +1,15 @@
+--- trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro.ORI	2013-07-02 19:27:56.391143562 +0200
++++ trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro	2013-07-02 19:30:59.279346578 +0200
+@@ -211,10 +211,10 @@
+ 	qscintilla_ru.ts
+ 
+ 
+-header.path = $(QTDIR)/include
++header.path = /usr/include/tqt3
+ header.files = qextscintilla*.h
+ 
+-trans.path = $(QTDIR)/translations
++trans.path = /usr/share/tqt3/translations
+ trans.files = qscintilla_*.qm
+ 
+ INSTALLS += header trans
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
new file mode 100644
index 000000000..7bad7ffb1
--- /dev/null
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -0,0 +1,178 @@
+# Default version for this component
+%define tdecomp tqscintilla
+%define tde_version 14.0.0
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE specific building variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tdecomp}
+Summary:		TQt source code editing component based on Scintilla
+Version:		1.7.1
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Development/Tools
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+Url:		http://www.riverbankcomputing.co.uk/qscintilla/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+# Fix FTBFS when using TQT3
+Patch0:		tqscintilla-14.0.0-ftbfs.patch
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+%description
+Scintilla is a free source code editing component. It has features found
+in standard editing components, as well as features especially useful
+when editing and debugging source code.
+
+TQScintilla is a port or Scintilla to the TQt GUI toolkit.
+
+
+%package designer
+Summary:        TQScintilla designer plugin 
+Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}
+Requires:       trinity-tqt3-designer
+
+%description designer
+%{summary}.
+
+%package devel
+Summary:        TQScintilla Development Files
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       trinity-tqt3-devel 
+
+%description devel
+%{summary}.
+
+%package doc
+Summary:        TQScintilla Documentation
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description doc
+%{summary}.
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
+
+%__sed -i "designer/designer.pro" \
+  -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
+  -e "s|# DESTDIR|DESTDIR|"
+
+( cd qt; tqmake "DESTDIR=$PWD/../tmplib" )
+( cd designer; tqmake )
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
+%__make %{?_smp_mflags} -C qt
+%__make %{?_smp_mflags} -C designer
+
+
+%install
+unset QTDIR QTINC QTLIB
+export QTDIR=%{_libdir}/tqt3
+%__rm -rf $RPM_BUILD_ROOT
+
+# Installs the QT part
+%__make INSTALL_ROOT=$RPM_BUILD_ROOT -C qt install
+
+# Installs supplementary headers
+for i in include/*.h; do
+	%__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/}
+done
+
+# Installs the HTML documentation
+for i in doc/html/*; do
+	%__install -D -m 644 $i %{buildroot}%{tde_docdir}/HTML/en/%{name}/${i##*/}
+done
+
+# Installs the Designer plugin
+for i in designer/*.so; do
+	%__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
+done
+
+# Installs libraries
+%__mkdir_p %{buildroot}%{_libdir}
+%__mv -f tmplib/* %{buildroot}%{_libdir}
+
+# Fix private headers location
+%__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3
+%__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog LICENSE NEWS README
+%{_libdir}/libqscintilla.so.*
+%{_datadir}/tqt3/translations/*.qm
+
+%files designer
+%defattr(-,root,root,-)
+%{_libdir}/tqt3/plugins/designer/*.so
+
+%files devel
+%defattr(-,root,root,-)
+%doc doc/html doc/Scintilla example
+%{_includedir}/tqscintilla/*.h
+%{_includedir}/tqscintilla/private/*.h
+%{_libdir}/libqscintilla.so
+
+%files doc
+%defattr(-,root,root,-)
+%{tde_docdir}/HTML/en/%{name}
+
+%changelog
+* Tue Jul 02 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.1-1
+- Initial build for TDE 14.0.0
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-ftbfs.patch b/redhat/dependencies/tqscintilla/tqscintilla-ftbfs.patch
deleted file mode 100644
index b4bb5b08e..000000000
--- a/redhat/dependencies/tqscintilla/tqscintilla-ftbfs.patch
+++ /dev/null
@@ -1,614 +0,0 @@
---- tqscintilla-master/qt/qextscintillacommandset.cpp.ORI	2011-12-04 14:33:29.344201345 +0100
-+++ tqscintilla-master/qt/qextscintillacommandset.cpp	2011-12-04 14:35:03.180233103 +0100
-@@ -43,525 +43,525 @@
- 			QextScintillaBase::SCI_LINEDOWN,
- 			TQt::Key_Down,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move down one line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEDOWNEXTEND,
- 			TQt::Key_Down | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection down one line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINESCROLLDOWN,
- 			TQt::Key_Down | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Scroll view down one line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEDOWNRECTEXTEND,
- 			TQt::Key_Down | TQt::ALT | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend rectangular selection down one line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEUP,
- 			TQt::Key_Up,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move up one line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEUPEXTEND,
- 			TQt::Key_Up | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection up one line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINESCROLLUP,
- 			TQt::Key_Up | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Scroll view up one line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEUPRECTEXTEND,
- 			TQt::Key_Up | TQt::ALT | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend rectangular selection up one line")
- 		},
- 		{
- 			QextScintillaBase::SCI_PARAUP,
- 			TQt::Key_BracketLeft | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move up one paragraph")
- 		},
- 		{
- 			QextScintillaBase::SCI_PARAUPEXTEND,
- 			TQt::Key_BracketLeft | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection up one paragraph")
- 		},
- 		{
- 			QextScintillaBase::SCI_PARADOWN,
- 			TQt::Key_BracketRight | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move down one paragraph")
- 		},
- 		{
- 			QextScintillaBase::SCI_PARADOWNEXTEND,
- 			TQt::Key_BracketRight | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection down one paragraph")
- 		},
- 		{
- 			QextScintillaBase::SCI_CHARLEFT,
- 			TQt::Key_Left,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move left one character")
- 		},
- 		{
- 			QextScintillaBase::SCI_CHARLEFTEXTEND,
- 			TQt::Key_Left | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection left one character")
- 		},
- 		{
- 			QextScintillaBase::SCI_WORDLEFT,
- 			TQt::Key_Left | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move left one word")
- 		},
- 		{
- 			QextScintillaBase::SCI_WORDLEFTEXTEND,
- 			TQt::Key_Left | TQt::SHIFT | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection left one word")
- 		},
- 		{
- 			QextScintillaBase::SCI_CHARLEFTRECTEXTEND,
- 			TQt::Key_Left | TQt::ALT | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend rectangular selection left one character")
- 		},
- 		{
- 			QextScintillaBase::SCI_CHARRIGHT,
- 			TQt::Key_Right,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move right one character")
- 		},
- 		{
- 			QextScintillaBase::SCI_CHARRIGHTEXTEND,
- 			TQt::Key_Right | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection right one character")
- 		},
- 		{
- 			QextScintillaBase::SCI_WORDRIGHT,
- 			TQt::Key_Right | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move right one word")
- 		},
- 		{
- 			QextScintillaBase::SCI_WORDRIGHTEXTEND,
- 			TQt::Key_Right | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection right one word")
- 		},
- 		{
- 			QextScintillaBase::SCI_CHARRIGHTRECTEXTEND,
- 			TQt::Key_Right | TQt::ALT | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend rectangular selection right one character")
- 		},
- 		{
- 			QextScintillaBase::SCI_WORDPARTLEFT,
- 			TQt::Key_Slash | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move left one word part")
- 		},
- 		{
- 			QextScintillaBase::SCI_WORDPARTLEFTEXTEND,
- 			TQt::Key_Slash | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection left one word part")
- 		},
- 		{
- 			QextScintillaBase::SCI_WORDPARTRIGHT,
- 			TQt::Key_Backslash | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move right one word part")
- 		},
- 		{
- 			QextScintillaBase::SCI_WORDPARTRIGHTEXTEND,
- 			TQt::Key_Backslash | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection right one word part")
- 		},
- 		{
- 			QextScintillaBase::SCI_VCHOME,
- 			TQt::Key_Home,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move to first visible character in line")
- 		},
- 		{
- 			QextScintillaBase::SCI_VCHOMEEXTEND,
- 			TQt::Key_Home | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection to first visible character in line")
- 		},
- 		{
- 			QextScintillaBase::SCI_DOCUMENTSTART,
- 			TQt::Key_Home | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move to start of text")
- 		},
- 		{
- 			QextScintillaBase::SCI_DOCUMENTSTARTEXTEND,
- 			TQt::Key_Home | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection to start of text")
- 		},
- 		{
- 			QextScintillaBase::SCI_HOMEDISPLAY,
- 			TQt::Key_Home | TQt::ALT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move to start of displayed line")
- 		},
- 		{
- 			QextScintillaBase::SCI_HOMEDISPLAYEXTEND,
- 			0,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection to start of line")
- 		},
- 		{
- 			QextScintillaBase::SCI_VCHOMERECTEXTEND,
- 			TQt::Key_Home | TQt::ALT | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend rectangular selection to first visible character in line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEEND,
- 			TQt::Key_End,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move to end of line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEENDEXTEND,
- 			TQt::Key_End | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection to end of line")
- 		},
- 		{
- 			QextScintillaBase::SCI_DOCUMENTEND,
- 			TQt::Key_End | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move to end of text")
- 		},
- 		{
- 			QextScintillaBase::SCI_DOCUMENTENDEXTEND,
- 			TQt::Key_End | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection to end of text")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEENDDISPLAY,
- 			TQt::Key_End | TQt::ALT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move to end of displayed line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEENDDISPLAYEXTEND,
- 			0,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection to end of displayed line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEENDRECTEXTEND,
- 			TQt::Key_End | TQt::ALT | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend rectangular selection to end of line")
- 		},
- 		{
- 			QextScintillaBase::SCI_PAGEUP,
- 			TQt::Key_Prior,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move up one page")
- 		},
- 		{
- 			QextScintillaBase::SCI_PAGEUPEXTEND,
- 			TQt::Key_Prior | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection up one page")
- 		},
- 		{
- 			QextScintillaBase::SCI_PAGEUPRECTEXTEND,
- 			TQt::Key_Prior | TQt::ALT | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend rectangular selection up one page")
- 		},
- 		{
- 			QextScintillaBase::SCI_PAGEDOWN,
- 			TQt::Key_Next,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move down one page")
- 		},
- 		{
- 			QextScintillaBase::SCI_PAGEDOWNEXTEND,
- 			TQt::Key_Next | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend selection down one page")
- 		},
- 		{
- 			QextScintillaBase::SCI_PAGEDOWNRECTEXTEND,
- 			TQt::Key_Next | TQt::ALT | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Extend rectangular selection down one page")
- 		},
- 		{
- 			QextScintillaBase::SCI_CLEAR,
- 			TQt::Key_Delete,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Delete current character")
- 		},
- 		{
- 			QextScintillaBase::SCI_CUT,
- 			TQt::Key_X | TQt::CTRL,
- 			TQt::Key_Delete | TQt::SHIFT,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Cut selection")
- 		},
- 		{
- 			QextScintillaBase::SCI_DELWORDRIGHT,
- 			TQt::Key_Delete | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Delete word to right")
- 		},
- 		{
- 			QextScintillaBase::SCI_DELLINERIGHT,
- 			TQt::Key_Delete | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Delete line to right")
- 		},
- 		{
- 			QextScintillaBase::SCI_EDITTOGGLEOVERTYPE,
- 			TQt::Key_Insert,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Toggle insert/overtype")
- 		},
- 		{
- 			QextScintillaBase::SCI_PASTE,
- 			TQt::Key_V | TQt::CTRL,
- 			TQt::Key_Insert | TQt::SHIFT,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Paste")
- 		},
- 		{
- 			QextScintillaBase::SCI_COPY,
- 			TQt::Key_C | TQt::CTRL,
- 			TQt::Key_Insert | TQt::CTRL,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Copy selection")
- 		},
- 		{
- 			QextScintillaBase::SCI_CANCEL,
- 			TQt::Key_Escape,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Cancel")
- 		},
- 		{
- 			QextScintillaBase::SCI_DELETEBACK,
- 			TQt::Key_Backspace,
- 			TQt::Key_Backspace | TQt::SHIFT,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Delete previous character")
- 		},
- 		{
- 			QextScintillaBase::SCI_DELWORDLEFT,
- 			TQt::Key_Backspace | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Delete word to left")
- 		},
- 		{
- 			QextScintillaBase::SCI_UNDO,
- 			TQt::Key_Z | TQt::CTRL,
- 			TQt::Key_Backspace | TQt::ALT,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Undo the last command")
- 		},
- 		{
- 			QextScintillaBase::SCI_DELLINELEFT,
- 			TQt::Key_Backspace | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Delete line to left")
- 		},
- 		{
- 			QextScintillaBase::SCI_REDO,
- 			TQt::Key_Y | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Redo last command")
- 		},
- 		{
- 			QextScintillaBase::SCI_SELECTALL,
- 			TQt::Key_A | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Select all text")
- 		},
- 		{
- 			QextScintillaBase::SCI_TAB,
- 			TQt::Key_Tab,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Indent one level")
- 		},
- 		{
- 			QextScintillaBase::SCI_BACKTAB,
- 			TQt::Key_Tab | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Move back one indentation level")
- 		},
- 		{
- 			QextScintillaBase::SCI_NEWLINE,
- 			TQt::Key_Return,
- 			TQt::Key_Return | TQt::SHIFT,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Insert new line")
- 		},
- 		{
- 			QextScintillaBase::SCI_ZOOMIN,
- 			TQt::Key_Plus | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Zoom in")
- 		},
- 		{
- 			QextScintillaBase::SCI_ZOOMOUT,
- 			TQt::Key_Minus | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Zoom out")
- 		},
- 		{
- 			QextScintillaBase::SCI_SETZOOM,
- 			0,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Set zoom")
- 		},
- 		{
- 			QextScintillaBase::SCI_FORMFEED,
- 			0,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Formfeed")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINECUT,
- 			TQt::Key_L | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Cut current line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINEDELETE,
- 			TQt::Key_L | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Delete current line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINECOPY,
- 			TQt::Key_T | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Copy current line")
- 		},
- 		{
- 			QextScintillaBase::SCI_LINETRANSPOSE,
- 			TQt::Key_T | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Swap current and previous lines")
- 		},
- 		{
- 			QextScintillaBase::SCI_SELECTIONDUPLICATE,
- 			TQt::Key_D | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Duplicate selection")
- 		},
- 		{
- 			QextScintillaBase::SCI_LOWERCASE,
- 			TQt::Key_U | TQt::CTRL,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Convert selection to lower case")
- 		},
- 		{
- 			QextScintillaBase::SCI_UPPERCASE,
- 			TQt::Key_U | TQt::CTRL | TQt::SHIFT,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Convert selection to upper case")
- 		},
- 		{
- 			QextScintillaBase::SCI_DELETEBACKNOTLINE,
- 			0,
- 			0,
--			TQT_TRANSLATE_NOOP("QextScintillaCommand",
-+			QT_TRANSLATE_NOOP("QextScintillaCommand",
- 				"Delete previous character if not at line start")
- 		},
- 	};
---- tqscintilla-master/designer/designer.pro.ORI	2011-12-04 14:41:08.714487484 +0100
-+++ tqscintilla-master/designer/designer.pro	2011-12-04 14:41:21.248222899 +0100
-@@ -5,7 +5,7 @@
- TARGET = qscintillaplugin
- # DESTDIR = $(QTDIR)/plugins/designer
- INCLUDEPATH = ../qt /usr/include/tqt
--LIBPATH += ../tmplib
-+LIBPATH += ../tmplib ../qt
- CONFIG += qt warn_on release plugin
- 
- SOURCES += qscintillaplugin.cpp
diff --git a/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec b/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
deleted file mode 100644
index 1c23e0bee..000000000
--- a/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
+++ /dev/null
@@ -1,235 +0,0 @@
-# Default version for this component
-%define kdecomp libtqscintilla
-%define version 1.7.1
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
-
-%global qtdir	%(qmake -query QT_INSTALL_PREFIX)
-%global qtdata	%(qmake -query QT_INSTALL_DATA)
-%global qtinc	%{qtdir}/include
-%global qtlib	%{qtdir}/lib
-
-
-Name:		%{kdecomp}
-Summary:	TQt source code editing component based on Scintilla
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Development/Tools
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-Url:		http://www.riverbankcomputing.co.uk/qscintilla/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# This file is a GIT snapshot
-Source0:	tqscintilla-master.tar.gz
-
-# Fix FTBFS
-Patch0:		tqscintilla-ftbfs.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-%description
-Scintilla is a free source code editing component. It has features found
-in standard editing components, as well as features especially useful
-when editing and debugging source code.
-
-TQScintilla is a port or Scintilla to the TQt GUI toolkit.
-
-
-%package designer
-Summary:        TQScintilla designer plugin 
-Group:          Development/Tools
-Requires:       %{name} = %{version}-%{release}
-Requires:       qt-designer
-%description designer
-%{summary}.
-
-%package devel
-Summary:        TQScintilla Development Files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       qt-devel 
-%description devel
-%{summary}.
-
-%package doc
-Summary:        TQScintilla Documentation
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-%description doc
-%{summary}.
-
-%prep
-%setup -q -n tqscintilla-master
-%patch0 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i */*.pro \
-	-e "s|/usr/include/tqt|%{_includedir}/tqt|g"
-
-( cd qt; qmake "DESTDIR=$PWD/../tmplib" )
-( cd designer; qmake )
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%__make %{?_smp_mflags} -C qt
-%__make %{?_smp_mflags} -C designer
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-
-# Installs the QT part
-%__make INSTALL_ROOT=$RPM_BUILD_ROOT -C qt install
-
-# Installs supplementary headers
-for i in include/*.h; do
-	%__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/}
-done
-
-# Installs the HTML documentation
-for i in doc/html/*; do
-	%__install -D -m 644 $i %{buildroot}%{tde_docdir}/HTML/en/%{name}/${i##*/}
-done
-
-# Installs the Designer plugin
-for i in designer/*.so; do
-	%__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
-done
-
-# Installs libraries
-%__mkdir_p %{buildroot}%{_libdir}
-%__mv -f tmplib/* %{buildroot}%{_libdir}
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog LICENSE NEWS README
-%{_libdir}/*.so.*
-%{qtdir}/translations/*.qm
-
-%files designer
-%defattr(-,root,root,-)
-%{qtdir}/plugins/designer/*.so
-
-%files devel
-%defattr(-,root,root,-)
-%doc doc/html doc/Scintilla example
-%{qtinc}/*.h
-%{qtinc}/private/*.h
-%{_libdir}/*.so
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_docdir}/HTML/en/%{name}
-
-%changelog
-* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.7.1-3
-- respin (BuildID)
-
-* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.7.1-2
-- License: GPLv2+
-
-* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.7.1-1
-- QScintilla-1.71-gpl-1.7.1
-
-* Thu Nov 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.7-1
-- QScintilla1-1.71-gpl-1.7 (#214192)
-
-* Sun Sep 03 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 1.6-3.3
-- FC6 rebuild.
-- Export flags.
-
-* Mon Feb 13 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 1.6-3.2
-- FC5 Rebuild.
-
-* Tue Jan 31 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 1.6-3.1
-- Rebuild for FC5.
-
-* Wed Sep 14 2005 Konstantin Ryabitsev <icon@linux.duke.edu> - 1.6-3
-- Fix permissions in prep, not in install.
-
-* Tue Sep 13 2005 Konstantin Ryabitsev <icon@linux.duke.edu> - 1.6-2
-- Fix permissions on doc files to be 0644.
-
-* Sun Sep 11 2005 Konstantin Ryabitsev <icon@linux.duke.edu> 1.6-1
-- Update to 1.65-gpl-1.6
-- Use the patch from Aurelien Bompard to build sanely in buildroot
-- Include docs and examples for the -devel package
-
-* Sat Aug 27 2005 Konstantin Ryabitsev <icon@linux.duke.edu> 1.5.1-1
-- Adapt for Fedora Extras
-- Drop 0-Epoch
-- Make specfile simpler
-- Move .so to devel
-
-* Mon Mar 09 2005 Rex Dieter 0:1.5.1-0.0.kde
-- 1.5.1
-
-* Thu Sep 16 2004 Rex Dieter <rexdieter at sf.net> 0:1.4-0.1.kde
-- updated designer-incpath patch: don't require an already installed
-  qscintilla-devel
-- BuildConflicts: qscintilla-devel != %%version
-
-* Thu Sep 16 2004 Rex Dieter <rexdieter at sf.net> 0:1.4-0.0.kde
-- 1.4
-- include designer plugin
-- Prereq: %%qtdir
-
-* Fri May 28 2004 Rex Dieter <rexdieter at sf.net> 0:1.3-0.fdr.0
-- 1.3
-
-* Thu Mar 11 2004 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.6
-- dynamically determine version for qt dependancy.
-
-* Wed Mar 10 2004 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.5
-- (re)build against qt-3.3.1
-
-* Wed Dec 03 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.4
-- remove extraneous macros
-- (re)build against qt-3.2.3
-
-* Mon Nov 10 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.3
-- (re)build against qt-3.2.2
-
-* Wed Sep 17 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.2
-- use Epoch's in Requires
-
-* Tue Aug 19 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.1
-- 1.2
-
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 15d8e2748..6194aee16 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -17,8 +17,8 @@
 # ...maybe others !!!!
 
 Name:		trinity-tqt3
-Version:	14.0.0%{?preversion:_%{preversion}}
-Release:	1%{?dist}
+Version:	3.5.0
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	The shared library for the Trinity Qt 3 GUI toolkit
 
 License:	QPL or GPLv2 or GPLv3
@@ -181,12 +181,6 @@ Requires: coreutils
 Requires: fontconfig >= 2.0
 Requires: /etc/ld.so.conf.d
 
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Obsoletes:		%{_lib}qt3
-Provides:		%{_lib}qt3 = 3.3.8.d
-%endif
-
-
 %description
 TQt is a GUI software toolkit which simplifies the task of writing and
 maintaining GUI (Graphical User Interface) applications
@@ -537,7 +531,6 @@ ln -s ../src/inputmethod/ntqinputcontextfactory.h include/ntqinputcontextfactory
 ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h
 
 # proceed
-#%__make %{?_smp_mflags} symlinks src-qmake src-moc
 %__make %{?_smp_mflags} sub-src sub-plugins sub-tools
 
 # build conv2ui
@@ -550,11 +543,16 @@ ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h
 %__sed -i lib/*.prl -e "s|${QTDIR}|%{tde_datadir}/tqt3|g"
 
 # fix QTDIR in 'qmake.conf'
-%__sed -i mkspecs/*/qmake.conf -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT		= \$(QTDIR)/include/tqt3|"
+%__sed -i mkspecs/*/qmake.conf \
+  -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT		= \$(QTDIR)/include/tqt3|" \
+  -e "s|\$(QTDIR)|/usr|g" \
+  -e "s|-lqt|-ltqt|g"
 
 
 %install
 %__rm -rf %{buildroot}
+export QTDIR=$(pwd)
+export PATH=${QTDIR}/stripbin:${QTDIR}/bin:$PATH
 
 %__make -C src INSTALL_ROOT=%{?buildroot} install_target
 %__make INSTALL_ROOT=%{?buildroot} install
@@ -576,5 +574,5 @@ ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h
 
 
 %changelog
-* Mon Feb 13 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+* Mon Feb 13 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.0-1
 - Initial build for TDE R14.0.0
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 5a86f514a..e613ee793 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -25,8 +25,8 @@ Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
 # TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqt3-devel >= 14.0.0
-Requires:		trinity-tqt3 >= 14.0.0
+BuildRequires:	trinity-tqt3-devel >= 3.5.0
+Requires:		trinity-tqt3 >= 3.5.0
 
 BuildRequires:	gcc-c++
 
@@ -52,15 +52,41 @@ BuildRequires:	libXi6-devel
 Obsoletes:	tqtinterface < %{version}-%{release}
 Provides:	tqtinterface = %{version}-%{release}
 
-
 %description
 Trinity QT Interface
 
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/convert_qt_tqt1
+%{tde_bindir}/convert_qt_tqt2
+%{tde_bindir}/convert_qt_tqt3
+%{tde_bindir}/dcopidl-tqt
+%{tde_bindir}/dcopidl2cpp-tqt
+%{tde_bindir}/dcopidlng-tqt
+%{tde_bindir}/mcopidl-tqt
+%{tde_bindir}/moc-tqt
+%{tde_bindir}/tmoc
+%{tde_bindir}/tqt-replace
+%{tde_bindir}/tqt-replace-stream
+%{tde_bindir}/uic-tqt
+%{tde_libdir}/libtqassistantclient.so.4
+%{tde_libdir}/libtqassistantclient.so.4.2.0
+%{tde_libdir}/libtqt.so.4
+%{tde_libdir}/libtqt.so.4.2.0
+
+##########
+
 %package devel
 Group:		Development/Libraries
 Summary:	%{name} - Development files
 Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tqt3-devel >= 14.0.0
+Requires:	trinity-tqt3-devel >= 3.5.0
 
 Obsoletes:	tqtinterface-devel < %{version}-%{release}
 Provides:	tqtinterface-devel = %{version}-%{release}
@@ -68,6 +94,25 @@ Provides:	tqtinterface-devel = %{version}-%{release}
 %description devel
 Development files for %{name}
 
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/tqt/
+%{tde_libdir}/libtqassistantclient.la
+%{tde_libdir}/libtqassistantclient.so
+%{tde_libdir}/libtqt.la
+%{tde_libdir}/libtqt.so
+%{tde_libdir}/pkgconfig/tqt.pc
+%{tde_libdir}/pkgconfig/tqtqui.pc
+%{cmake_modules_dir}/*.cmake
+
+##########
+
 %if 0%{?suse_version} || 0%{?pclinuxos}
 %debug_package
 %endif
@@ -119,51 +164,10 @@ for i in cmake/modules/*.cmake; do
   %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
 done
 
+
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/convert_qt_tqt1
-%{tde_bindir}/convert_qt_tqt2
-%{tde_bindir}/convert_qt_tqt3
-%{tde_bindir}/dcopidl-tqt
-%{tde_bindir}/dcopidl2cpp-tqt
-%{tde_bindir}/dcopidlng-tqt
-%{tde_bindir}/mcopidl-tqt
-%{tde_bindir}/moc-tqt
-%{tde_bindir}/tmoc
-%{tde_bindir}/tqt-replace
-%{tde_bindir}/tqt-replace-stream
-%{tde_bindir}/uic-tqt
-%{tde_libdir}/libtqassistantclient.so.4
-%{tde_libdir}/libtqassistantclient.so.4.2.0
-%{tde_libdir}/libtqt.so.4
-%{tde_libdir}/libtqt.so.4.2.0
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/tqt/
-%{tde_libdir}/libtqassistantclient.la
-%{tde_libdir}/libtqassistantclient.so
-%{tde_libdir}/libtqt.la
-%{tde_libdir}/libtqt.so
-%{tde_libdir}/pkgconfig/tqt.pc
-%{tde_libdir}/pkgconfig/tqtqui.pc
-%{cmake_modules_dir}/*.cmake
-
 
 %changelog
 * Tue Feb 14 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1