Author: schubi2 Date: Fri Jun 13 17:47:03 2008 New Revision: 10376 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10376&view=rev Log: moved to qt4 Modified: trunk/libzypp-testsuite/Makefile.cvs trunk/libzypp-testsuite/configure.ac trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in trunk/libzypp-testsuite/solver/src/Makefile.am Modified: trunk/libzypp-testsuite/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/Makefile.cvs?rev=10376&r1=10375&r2=10376&view=diff ============================================================================== --- trunk/libzypp-testsuite/Makefile.cvs (original) +++ trunk/libzypp-testsuite/Makefile.cvs Fri Jun 13 17:47:03 2008 @@ -20,8 +20,8 @@ configure: init ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) \ --disable-static \ - --with-qt-dir=/usr/lib/qt3 \ - --with-qt-libdir=/usr/lib/qt3/$(LIB) \ + --with-qt-dir=/usr/lib/qt4 \ + --with-qt-libdir=/usr/$(LIB) \ $(CONFIGURE_OPTS) init: Modified: trunk/libzypp-testsuite/configure.ac URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/configure.ac?rev=10376&r1=10375&r2=10376&view=diff ============================================================================== --- trunk/libzypp-testsuite/configure.ac (original) +++ trunk/libzypp-testsuite/configure.ac Fri Jun 13 17:47:03 2008 @@ -55,8 +55,8 @@ AM_PROG_LIBTOOL dnl Check qt paths -QTDIR="/usr/lib/qt3" -QTLIBDIR="/usr/lib/qt3/lib" +QTDIR="/usr/lib/qt4" +QTLIBDIR="/usr/lib" AC_ARG_WITH(qt-dir, AS_HELP_STRING([--with-qt-dir=DIR], [where the root of Qt is installed.]), Modified: trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in?rev=10376&r1=10375&r2=10376&view=diff ============================================================================== --- trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in (original) +++ trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in Fri Jun 13 17:47:03 2008 @@ -9,8 +9,8 @@ # Name: libzypp-testsuite-tools -BuildRequires: gcc-c++ libzypp-devel libzypp fdupes dejagnu ruby ruby-zypp ruby-zypptools libexpat-devel qt3-devel libqdialogsolver1-devel -Requires: ruby-zypp ruby-zypptools qt3 libqdialogsolver1 +BuildRequires: gcc-c++ libzypp-devel libzypp fdupes dejagnu ruby ruby-zypp ruby-zypptools libexpat-devel libqt4-devel libqdialogsolver1-devel +Requires: ruby-zypp ruby-zypptools libqt4 libqdialogsolver1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on Modified: trunk/libzypp-testsuite/solver/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/Makefile.am?rev=10376&r1=10375&r2=10376&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/src/Makefile.am (original) +++ trunk/libzypp-testsuite/solver/src/Makefile.am Fri Jun 13 17:47:03 2008 @@ -4,11 +4,12 @@ INCLUDES = -I/usr/include/libxml2 \ -I$(prefix)/include \ - -I/usr/lib/qt3/include + -I/usr/include/Qt \ + -DQT3_SUPPORT \ -DZYPP_BASE_LOGGER_LOGGROUP=\"testsuite\" -LDADD = $(libdir)/libzypp.so $(libdir)/libsatsolver.a -lexpat -L$(QTLIBDIR) -lqt-mt -lqdialogsolver +LDADD = $(libdir)/libzypp.so $(libdir)/libsatsolver.a -lexpat -lQtCore -lQtGui -lQt3Support -lqdialogsolver # We're not ready for this yet. #check_PROGRAMS = deptestomatic.multi -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org