Author: schubi2 Date: Fri May 16 17:40:34 2008 New Revision: 10130 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10130&view=rev Log: adde graphical interface again Modified: trunk/libzypp-testsuite/solver/src/Makefile.am trunk/libzypp-testsuite/solver/src/deptestomatic.cc Modified: trunk/libzypp-testsuite/solver/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/Makefile.am?rev=10130&r1=10129&r2=10130&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/src/Makefile.am (original) +++ trunk/libzypp-testsuite/solver/src/Makefile.am Fri May 16 17:40:34 2008 @@ -4,9 +4,11 @@ INCLUDES = -I/usr/include/libxml2 \ -I$(prefix)/include \ + -I/usr/lib/qt3/include -DZYPP_BASE_LOGGER_LOGGROUP=\"testsuite\" -LDADD = $(libdir)/libzypp.so $(libdir)/libsatsolver.a -lexpat + +LDADD = $(libdir)/libzypp.so $(libdir)/libsatsolver.a -lexpat -L$(QTLIBDIR) -lqt-mt -lqdialogsolver # We're not ready for this yet. #check_PROGRAMS = deptestomatic.multi Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/deptestomatic.cc?rev=10130&r1=10129&r2=10130&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Fri May 16 17:40:34 2008 @@ -28,13 +28,11 @@ #include <iostream> #include <map> #include <set> -#if 0 #include #include #include #include #include -#endif #include #include <cstdlib> #include <cstring> @@ -82,6 +80,7 @@ #include "zypp/solver/detail/SolverQueueItemInstallOneOf.h" #include "zypp/solver/detail/SolverQueueItemLock.h" #include "zypp/solver/detail/SolverQueueItemUpdate.h" +#include "zypp/QZyppSolverDialog.h" #include "KeyRingCallbacks.h" #include "XmlNode.h" @@ -1073,7 +1072,7 @@ string get_licence = node->getProp ("getlicence"); string verbose = node->getProp ("verbose"); print_pool( resolver, prefix, !all.empty(), get_licence, !verbose.empty() ); -#if 0 + } else if (node->equals ("graphic")) { resolver->resolvePool(); QApplication app(0, NULL); @@ -1083,7 +1082,6 @@ dialog->setMinimumSize ( 700, 700 ); dialog->show(); app.exec(); -#endif } else if (node->equals ("lock")) { string source_alias = node->getProp ("channel"); string package_name = node->getProp ("name"); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org