qt 3.1 port planing

Bob Tanner kde-cygwin@mail.kde.org
Wed, 4 Dec 2002 02:17:15 -0600


On Tuesday 26 November 2002 06:24 pm, Ralf Habacker wrote:
> $cd <your qt-3-snapshot>
> $cvs import -m "QT 3.1.0 rc2 Release" qt-3 QT_IMPORT qt_3_1_0_rc2
>
> $ cerate a diff file
> $ cd <your checked out qt-3 dir>
> $ cvs diff -ubB -r qt_3_1_0_rc1 -r qt_3_1_0_rc2  | tee qt310_rc1_rc2.di=
f
> $ patch -p0 <qt310_rc1_rc2.dif
> $ cvs ci -m "update to qt3.1.0 rc2"

Got everything patched, but something broke in the merge. Example explain=
s it=20
best:

g++ -c -o pbuilder_pbx.o -g -I. -Igenerators -Igenerators/unix=20
-Igenerators/win32  -Igenerators/mac -I@OUT_QTDIR@/include=20
-I@REL_QTDIR@/include -I@OUT_QTDIR@/src/tools -DQT_NO_TEXTCODEC=20
-DQT_NO_COMPONENT -DQT_NO_STL -I/cygdrive/r/BUILD/qt-3/mkspecs/cygwin-g++=
=20
generators/mac/pbuilder_pbx.cpp

@OUT_QTDIR@
@REL_QTDIR@
@OUT_QTDIR@

Are not being replaced. This worked before the merge, so I must have miss=
ed=20
something or messed something up.

--=20
Bob Tanner <tanner@real-time.com>         | Phone : (952)943-8700
http://www.mn-linux.org, Minnesota, Linux | Fax   : (952)943-8500
http://www.linuxjustworks.com             | Linux Just Works!        =20
Key fingerprint =3D AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288