Author: coolo
Date: Wed Dec 12 15:09:55 2007
New Revision: 43020
URL: http://svn.opensuse.org/viewcvs/yast?rev=43020&view=rev
Log:
renamed the component back to qt
Added:
trunk/qt/package/yast2-qt.changes (contents, props changed)
- copied, changed from r43019, trunk/qt/package/yast2-qt4.changes
trunk/qt/yast2-qt.spec.in (contents, props changed)
- copied, changed from r43019, trunk/qt/yast2-qt4.spec.in
Removed:
trunk/qt/package/yast2-qt4.changes
trunk/qt/yast2-qt4.spec.in
Modified:
trunk/qt/ (props changed)
trunk/qt/CMakeLists.txt
trunk/qt/RPMNAME
trunk/qt/VERSION.cmake
trunk/qt/src/CMakeLists.txt
trunk/qt/src/Y2CCQt.cc
trunk/qt/src/Y2CCQt.h
trunk/qt/src/YQDialog.cc
trunk/qt/src/YQPackageSelectorPlugin.cc
trunk/qt/src/YQUIComponent.h
trunk/qt/src/pkg/CMakeLists.txt
Modified: trunk/qt/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/CMakeLists.txt?rev=43020&r1=43019&r2=43020&view=diff
==============================================================================
--- trunk/qt/CMakeLists.txt (original)
+++ trunk/qt/CMakeLists.txt Wed Dec 12 15:09:55 2007
@@ -1,11 +1,11 @@
-PROJECT(yast2-qt4)
+PROJECT(yast2-qt)
SET( CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake/Modules" ${CMAKE_MODULE_PATH} )
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Woverloaded-virtual -Wno-deprecated" )
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall" )
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG -DNDEBUG")
-SET( RPMNAME "yast2-qt4" )
+SET( RPMNAME "yast2-qt" )
FIND_PACKAGE(Qt4 REQUIRED)
FIND_PACKAGE(Yast REQUIRED)
Modified: trunk/qt/RPMNAME
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/RPMNAME?rev=43020&r1=43019&r2=43020&view=diff
==============================================================================
--- trunk/qt/RPMNAME (original)
+++ trunk/qt/RPMNAME Wed Dec 12 15:09:55 2007
@@ -1 +1 @@
-yast2-qt4
+yast2-qt
Modified: trunk/qt/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=43020&r1=43019&r2=43020&view=diff
==============================================================================
--- trunk/qt/VERSION.cmake (original)
+++ trunk/qt/VERSION.cmake Wed Dec 12 15:09:55 2007
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "16")
-SET(VERSION_PATCH "8")
+SET(VERSION_PATCH "9")
Copied: trunk/qt/package/yast2-qt.changes (from r43019, trunk/qt/package/yast2-qt4.changes)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?p2=trunk/qt/package/yast2-qt.changes&p1=trunk/qt/package/yast2-qt4.changes&r1=43019&r2=43020&rev=43020&view=diff
==============================================================================
--- trunk/qt/package/yast2-qt4.changes (original)
+++ trunk/qt/package/yast2-qt.changes Wed Dec 12 15:09:55 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Dec 12 15:04:34 CET 2007 - coolo@suse.de
+
+- merged yast2-qt4 into yast2-qt
+- V 2.16.9
+
+-------------------------------------------------------------------
Tue Dec 11 16:34:56 CET 2007 - sh@suse.de
- Fixed bug #346129: Too many wizard steps if UTF-8 chars used
Modified: trunk/qt/src/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/CMakeLists.txt?rev=43020&r1=43019&r2=43020&view=diff
==============================================================================
--- trunk/qt/src/CMakeLists.txt (original)
+++ trunk/qt/src/CMakeLists.txt Wed Dec 12 15:09:55 2007
@@ -10,7 +10,7 @@
-DQTLIBDIR=\\\"${LIB_INSTALL_DIR}\\\"
)
-SET(qt4_yast_plugin_SRCS
+SET(qt_yast_plugin_SRCS
QY2CharValidator.cc QY2ComboTabWidget.cc QY2DiskUsageList.cc
QY2ListView.cc QY2Settings.cc Y2CCQt.cc
YFrameBuffer.cc YQAlignment.cc YQApplication.cc YQBarGraph.cc
@@ -30,26 +30,26 @@
YQWizard.cc QY2Styler.cc
)
-QT4_AUTOMOC(${qt4_yast_plugin_SRCS})
+QT4_AUTOMOC(${qt_yast_plugin_SRCS})
-QT4_WRAP_UI(qt4_yast_plugin_SRCS QHelpDialog.ui)
+QT4_WRAP_UI(qt_yast_plugin_SRCS QHelpDialog.ui)
INCLUDE_DIRECTORIES( ${QT_INCLUDES} )
INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR}/yui )
-ADD_LIBRARY( py2qt4 SHARED ${qt4_yast_plugin_SRCS})
-TARGET_LINK_LIBRARIES( py2qt4 ${YAST_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${YAST_YCP_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${YAST_PLUGIN_WFM_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${QT_QTCORE_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${QT_QTGUI_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${YAST_PLUGIN_UI_LIBRARY} )
-SET_TARGET_PROPERTIES( py2qt4 PROPERTIES SOVERSION 2 )
+ADD_LIBRARY( py2qt SHARED ${qt_yast_plugin_SRCS})
+TARGET_LINK_LIBRARIES( py2qt ${YAST_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${YAST_YCP_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${YAST_PLUGIN_WFM_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${QT_QTCORE_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${QT_QTGUI_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${YAST_PLUGIN_UI_LIBRARY} )
+SET_TARGET_PROPERTIES( py2qt PROPERTIES SOVERSION 2 )
-INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
+INSTALL(TARGETS py2qt LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
ADD_SUBDIRECTORY(pkg)
-#SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" )
+#SET_TARGET_PROPERTIES( y2lang_qt PROPERTIES PREFIX "" )
Modified: trunk/qt/src/Y2CCQt.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/Y2CCQt.cc?rev=43020&r1=43019&r2=43020&view=diff
==============================================================================
--- trunk/qt/src/Y2CCQt.cc (original)
+++ trunk/qt/src/Y2CCQt.cc Wed Dec 12 15:09:55 2007
@@ -24,6 +24,6 @@
// the Y2ComponentBroker, so that will be able to find it.
// This all happens before main() is called!
-Y2CCQt g_y2ccqt4;
+Y2CCQt g_y2ccqt;
Modified: trunk/qt/src/Y2CCQt.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/Y2CCQt.h?rev=43020&r1=43019&r2=43020&view=diff
==============================================================================
--- trunk/qt/src/Y2CCQt.h (original)
+++ trunk/qt/src/Y2CCQt.h Wed Dec 12 15:09:55 2007
@@ -51,7 +51,7 @@
*/
Y2Component *create(const char * name) const
{
- if (!strcmp(name, "qt4") )
+ if (!strcmp(name, "qt") )
{
Y2Component* ret = YUIComponent::uiComponent ();
if (!ret || ret->name () != name)
Modified: trunk/qt/src/YQDialog.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.cc?rev=43020&r1=43019&r2=43020&view=diff
==============================================================================
--- trunk/qt/src/YQDialog.cc (original)
+++ trunk/qt/src/YQDialog.cc Wed Dec 12 15:09:55 2007
@@ -24,6 +24,7 @@
#include