[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-02-20 13:40:04
Message-ID: 1140442804.487324.8339.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 511605 by eva:

- added acinclude.m4.in version, which allows to use qte2 and konq with
rtti and thread support
- copy this version over for qte2 in konq-embed/prepare_kde_src 
- document changes in ChangeLog


 A             devscripts/acinclude.m4.in.qt2  
 M  +4 -0      devscripts/build-it-local-embedded.sh  
 M  +6 -0      konq-embed/ChangeLog  
 M  +3 -0      konq-embed/prepare_kde_src  


--- trunk/kdenox/devscripts/build-it-local-embedded.sh #511604:511605
@@ -1,4 +1,8 @@
 
+if test ! -x ../kdenox/admin
+  cp -a ../kdelibs/admin ../kdenox
+fi
+
 export TARGET=x86
 #export ARCH_CONFIG_OPTION=
 
--- trunk/kdenox/konq-embed/ChangeLog #511604:511605
@@ -1,3 +1,9 @@
+2006-02-20 Eva Brucherseifer <eva.brucherseifer@basyskom.de>
+    * Adapted Qt3 and Qt2 patches to work with kdelibs version 3.5.1
+    * Added patched version of acinclude.m4.in to devscripts dir, 
+      which works for Qt2.
+      For Konq/E we need rtti and thread support in qt-embedded
+
 2006-02-07 Eva Brucherseifer <eva.brucherseifer@basyskom.de>
     * Added config files konq-embedrc, kcookiejarrc, cryptodefaults
     * Those config files are installed to the prefix location
--- trunk/kdenox/konq-embed/prepare_kde_src #511604:511605
@@ -471,6 +471,8 @@
     2.3.*)
 	    echo "* Prefaring Buildsystem for Qt2.."
 		perl -pi -e "s,KDE_USE_QT\(3[.]1\),KDE_USE_QT(2.3)," ../configure.in.in
+		cp ./../admin/acinclude.m4.in ./../admin/acinclude.m4.in.org
+		cp ./../devscripts/acinclude.m4.in.qt2 ./../admin/acinclude.m4.in
 		cp ./dropin/Makefile.am.qt2 ./dropin/Makefile.am
 
 	    echo "* Copy special dropins to compile with qt/e 2.3.x"
@@ -505,6 +507,7 @@
 	    ;;
     *) echo "Remove special dropins for qt/e 2.x.x (if available)"
 		perl -pi -e "s,KDE_USE_QT(2.3),KDE_USE_QT(3.1)," ../configure.in.in
+		cp ./../admin/acinclude.m4.in.org ./../admin/acinclude.m4.in
 		rm -f ./dropin/q*
 		rm -f ./dropin/objectdeleter.*
 		cp ./dropin/Makefile.am.qt3 ./dropin/Makefile.am
[prev in list] [next in list] [prev in thread] [next in thread]