Author: dmacvicar Date: Tue Nov 27 01:31:42 2007 New Revision: 42415 URL: http://svn.opensuse.org/viewcvs/yast?rev=42415&view=rev Log: - load the right package selector now it loads just fine. I still wonder what coolo defined as glitches. Modified: branches/tmp/coolo/qt4-port/CMakeLists.txt branches/tmp/coolo/qt4-port/src/CMakeLists.txt branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc Modified: branches/tmp/coolo/qt4-port/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/CMakeLists.txt?rev=42415&r1=42414&r2=42415&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/CMakeLists.txt Tue Nov 27 01:31:42 2007 @@ -8,5 +8,9 @@ FIND_PACKAGE(Yast REQUIRED) INCLUDE(YastCommon) +SET(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) +SET(Y2QT_LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) +SET(Y2QT_THEMEDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme) + ADD_SUBDIRECTORY(src) Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeLists.txt?rev=42415&r1=42414&r2=42415&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Tue Nov 27 01:31:42 2007 @@ -4,10 +4,10 @@ -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS} -DQT3_SUPPORT -DQT_LOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/qt4/translations\\\" --DICONDIR=\\"${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current\\" --DLOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/locale\\\" +-DICONDIR=\\"${Y2QT_ICONDIR}\\" +-DLOCALEDIR=\\\"${Y2QT_LOCALEDIR}\\\" -DLANG_FONTS_FILE=\\\"${CMAKE_INSTALL_PREFIX}/share/fonts/lang_fonts\\\" --DTHEMEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/YaST2/theme\\\" +-DTHEMEDIR=\\\"${Y2QT_THEMEDIR}\\\" -DQTLIBDIR=\\\"${LIB_INSTALL_DIR}\\\" ) @@ -17,10 +17,6 @@ QY2CharValidator.cc QY2ComboTabWidget.cc QY2DiskUsageList.cc QY2LayoutUtils.cc QY2ListView.cc QY2Settings.cc Y2CCQt.cc YFrameBuffer.cc YQAlignment.cc YQApplication.cc YQBarGraph.cc YQCheckBox.cc YQCheckBoxFrame.cc YQComboBox.cc YQDateField.cc YQDialog.cc YQDownloadProgress.cc YQDumbTab.cc YQEBunny.cc YQEmpty.cc YQFrame.cc YQGenericButton.cc YQIconPool.cc YQImage.cc YQInputField.cc YQIntField.cc YQLabel.cc YQLayoutBox.cc YQLogView.cc YQMenuButton.cc YQMultiLineEdit.cc YQMultiProgressMeter.cc YQMultiSelectionBox.cc YQOptionalWidgetFactory.cc YQPackageSelectorPlugin.cc YQPartitionSplitter.cc YQProgressBar.cc YQPushButton.cc YQRadioButton.cc YQRadioButtonGroup.cc YQReplacePoint.cc YQRichText.cc YQSelectionBox.cc YQSignalBlocker.cc YQSlider.cc YQSpacing.cc YQSquash.cc YQTable.cc YQTimeField.cc YQTree.cc YQUI_builtins.cc YQUI_core.cc YQUI_widgets.cc YQUI_x11.cc YQWidgetCaption.cc YQWidgetFactory.cc YQWizardButton.cc YQWizard.cc ) -SET(qt4_yast_plugin_HEADERS - QY2CharValidator.h QY2ComboTabWidget.h QY2DiskUsageList.h QY2LayoutUtils.h QY2ListView.h QY2Settings.h utf8.h Y2CCQt.h YFrameBuffer.h YQAlignment.h YQApplication.h YQBarGraph.h YQCheckBoxFrame.h YQCheckBox.h YQComboBox.h YQDateField.h YQDialog.h YQDownloadProgress.h YQDumbTab.h YQEBunny.h YQEmpty.h YQFrame.h YQGenericButton.h YQi18n.h YQIconPool.h YQImage.h YQInputField.h YQIntField.h YQLabel.h YQLayoutBox.h YQLogView.h YQMenuButton.h YQMultiLineEdit.h YQMultiProgressMeter.h YQMultiSelectionBox.h YQOptionalWidgetFactory.h YQPackageSelectorPlugin.h YQPartitionSplitter.h YQProgressBar.h YQPushButton.h YQRadioButtonGroup.h YQRadioButton.h YQReplacePoint.h YQRichText.h YQSelectionBox.h YQSignalBlocker.h YQSlider.h YQSpacing.h YQSquash.h YQTable.h YQTimeField.h YQTree.h YQUIComponent.h YQUI.h YQWidgetCaption.h YQWidgetFactory.h YQWizardButton.h YQWizard.h -) - QT4_AUTOMOC(${qt4_yast_plugin_SRCS}) INCLUDE_DIRECTORIES( ${QT_INCLUDES} ) @@ -35,9 +31,12 @@ TARGET_LINK_LIBRARIES( py2qt4 ${QT_QTGUI_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt4 ${QT_QT3SUPPORT_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt4 ${YAST_PLUGIN_UI_LIBRARY} ) -#SET_TARGET_PROPERTIES( py2qt4 PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" ) SET_TARGET_PROPERTIES( py2qt4 PROPERTIES SOVERSION 2 ) INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) +ADD_SUBDIRECTORY(pkg) + + + #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" ) \ No newline at end of file Modified: branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc?rev=42415&r1=42414&r2=42415&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc Tue Nov 27 01:31:42 2007 @@ -26,7 +26,7 @@ #include "YQSimplePatchSelector.h" #include "YUIException.h" -#define PLUGIN_BASE_NAME "qt_pkg" +#define PLUGIN_BASE_NAME "qt4_pkg" YQPackageSelectorPlugin::YQPackageSelectorPlugin() -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org