[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Christian Ehrlicher]

SVN commit 835292 by chehrlic:

remove hack for mingw + cmake 2.4.x - nobody on windows is using cmake 2.4 anymore

 M  +2 -32     CMakeLists.txt  
 M  +1 -1      umllistview.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #835291:835292
@@ -390,38 +390,8 @@
    worktoolbar.cpp
 )
 
-if (WIN32)
-    # workaround for win32 command line to long problem
-    # build intermediate libraries
+kde4_add_kcfg_files(umbrello_SRCS umbrellosettings.kcfgc)
 
-    kde4_add_library(dialogs  	${libdialogs_SRCS})
-    target_link_libraries (dialogs)
-    set (libdialogs_SRCS)
-
-    kde4_add_library(codeimport ${libcodeimport_SRCS})
-    target_link_libraries (codeimport)
-    set (libcodeimport_SRCS)
-
-    kde4_add_kcfg_files(libcodegenerator_SRCS umbrellosettings.kcfgc)
-    kde4_add_library(generators ${libcodegenerator_SRCS})
-    target_link_libraries (generators )
-    set (libcodegenerator_SRCS)
-
-    kde4_add_library(docgenerator ${libdocgenerator_SRCS})
-    target_link_libraries (docgenerator)
-    set (libdocgenerator_SRCS)
-
-    kde4_add_library(cmds ${libcmds_SRCS})
-    target_link_libraries (cmds)
-    set (libcmds_SRCS)
-
-    set (LIBS codeimport dialogs generators docgenerator cmds)
-
-else (WIN32)
-    set (LIBS )
-    kde4_add_kcfg_files(umbrello_SRCS umbrellosettings.kcfgc)
-endif (WIN32)
-
 set (umbrello_SRCS
 	${umbrello_SRCS}
 	${libdialogs_SRCS}
@@ -439,7 +409,7 @@
 
 kde4_add_app_icon(umbrello_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-umbrello.png")
 kde4_add_executable(umbrello ${umbrello_SRCS})
-target_link_libraries(umbrello  ${LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBUUID} )
+target_link_libraries(umbrello  ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBUUID} )
 install(TARGETS umbrello ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### install files ###############
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #835291:835292
@@ -148,7 +148,7 @@
 
 bool UMLListView::eventFilter(QObject *o, QEvent *e)
 {
-    if (e->type() != QEvent::MouseButtonPress || !o->isA("QHeader"))
+    if (e->type() != QEvent::MouseButtonPress || qstrcmp("QHeader", metaObject()->className()) != 0)
         return Q3ListView::eventFilter(o, e);
     QMouseEvent *me = static_cast<QMouseEvent*>(e);
     if (me->button() == Qt::RightButton) {