[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2008-04-02 12:51:19
Message-ID: 1207140679.396598.1672.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 792861 by wildfox:

Resolve ambigious linkage. geodatatest linked against marblewidget and compiled in \
geodata_SRCS. marblewidget also compiled in geodata_SRCS, resulting in problems with \
the static initialization of the tag handlers. Reenable assertion, to cover \
duplicated registrations (at least on linux)


 M  +5 -0      CMakeLists.txt  
 M  +0 -3      geodata/CMakeLists.txt  
 M  +3 -2      geodata/parser/GeoTagHandler.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #792860:792861
@@ -218,6 +218,11 @@
   endif(APPLE AND QTONLY)
 endif(WIN32 AND QTONLY)
 
+add_executable(geodatatest geodata/GeoDataTest.cpp)
+target_link_libraries (geodatatest marblewidget)
+
+install (TARGETS geodatatest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+
 ########### install files ###############
 
 if (APPLE AND QTONLY)
--- trunk/KDE/kdeedu/marble/src/lib/geodata/CMakeLists.txt #792860:792861
@@ -86,7 +86,4 @@
         ${geodata_handlers_dgml_SRCS}
    )
 
-add_executable(geodatatest ${geodata_SRCS} geodata/GeoDataTest.cpp)
-target_link_libraries (geodatatest ${QT_QTCORE_LIBRARY} marblewidget)
 
-install (TARGETS geodatatest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
--- trunk/KDE/kdeedu/marble/src/lib/geodata/parser/GeoTagHandler.cpp #792860:792861
@@ -52,9 +52,10 @@
 void GeoTagHandler::registerHandler(const QualifiedName& qName, const GeoTagHandler* \
handler)  {
     TagHash* hash = tagHandlerHash();
-// FIXME: Taking this out for now:
-//    Q_ASSERT(!hash->contains(qName));
+
+    Q_ASSERT(!hash->contains(qName));
     hash->insert(qName, handler);
+    Q_ASSERT(hash->contains(qName));
 
 #if DUMP_TAG_HANDLER_REGISTRATION > 0
     qDebug() << "[GeoTagHandler] -> Recognizing" << qName.first << "tag with \
namespace" << qName.second;


[prev in list] [next in list] [prev in thread] [next in thread]