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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2007-06-01 19:02:20
Message-ID: 1180724540.102852.18412.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 670498 by chehrlic:

first bunch of fixes

 M  +1 -1      CMakeLists.txt  
 M  +2 -2      MarbleControlBox.cpp  
 M  +2 -2      MarbleControlBox.ui  
 M  +1 -1      katlascontrol.h  
 M  +7 -9      lib/CMakeLists.txt  
 M  +2 -1      lib/MarbleWidget.h  
 M  +2 -1      lib/katlasthemeselectview.h  
 M  +2 -1      lib/maptheme.h  
 D             lib/marble.rc  
 A             lib/marble_export.h   [License: UNKNOWN]
 M  +2 -1      lib/placemarkmodel.h  
 M  +2 -1      lib/searchlistview.h  
 A             marble.rc   lib/marble.rc#670489


--- trunk/KDE/kdeedu/marble/src/CMakeLists.txt #670497:670498
@@ -66,7 +66,7 @@
 if (QTONLY)
     target_link_libraries (marble ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} \
${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY} \
${QT_QTMAIN_LIBRARY} marblewidget)  else (QTONLY)
-    target_link_libraries (marble ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} \
${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY} \
${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KIO_LIBRARY} \
${QT_QTMAIN_LIBRARY}) +    target_link_libraries (marble ${QT_QTCORE_LIBRARY} \
${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} \
${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} \
${KDE4_KIO_LIBRARY} ${QT_QTMAIN_LIBRARY} marblewidget)  endif (QTONLY)
 if(WIN32)
   target_link_libraries(marble ws2_32 imm32 winmm)
--- trunk/KDE/kdeedu/marble/src/MarbleControlBox.cpp #670497:670498
@@ -28,8 +28,8 @@
 #include <QtGui/QStringListModel>
 #include <QtGui/QTextFrame>
 
-#include <marble/katlasdirs.h>
-#include <marble/maptheme.h>
+#include <lib/katlasdirs.h>
+#include <lib/maptheme.h>
 
 
 MarbleControlBox::MarbleControlBox(QWidget *parent)
--- trunk/KDE/kdeedu/marble/src/MarbleControlBox.ui #670497:670498
@@ -496,12 +496,12 @@
   <customwidget>
    <class>KAtlasThemeSelectView</class>
    <extends>QListView</extends>
-   <header>marble/katlasthemeselectview.h</header>
+   <header>lib/katlasthemeselectview.h</header>
   </customwidget>
   <customwidget>
    <class>SearchListView</class>
    <extends>QListView</extends>
-   <header>marble/searchlistview.h</header>
+   <header>lib/searchlistview.h</header>
   </customwidget>
  </customwidgets>
  <resources>
--- trunk/KDE/kdeedu/marble/src/katlascontrol.h #670497:670498
@@ -18,7 +18,7 @@
 #define KATLASCONTROL_H
 
 
-#include <marble/MarbleWidget.h>
+#include <lib/MarbleWidget.h>
 
 #include <QtGui/QPixmap>
 
--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #670497:670498
@@ -69,14 +69,6 @@
 #  set(marble_HDRS ${marble_HDRS} KdeMainWindow.h)
 #endif (QTONLY)
 
-#if(MSVC)
-#  set(marble_SRCS ${marble_SRCS} marble.rc)
-#endif(MSVC)
-
-#if(MINGW)
-#   QT4_ADD_RESOURCES2(marble_SRCS marble.rc)
-#endif(MINGW)
-
 set (marblewidget_UI katlastilecreatordialog.ui placemarkinfodialog.ui \
katlasaboutdialog.ui  #           marblecontrol.ui	   MarbleControlBox.ui 
 )
@@ -121,6 +113,10 @@
 endif(WIN32)
 
 # set_target_properties(marblewidget PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION}) +# needed for marble_export.h
+set_target_properties(marblewidget PROPERTIES
+  DEFINE_SYMBOL MAKE_MARBLE_LIB
+)
 
 install(TARGETS marblewidget DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 
@@ -168,6 +164,8 @@
            vectorcomposer.h
            vectormap.h
            xmlhandler.h
-           DESTINATION ${CMAKE_INSTALL_PREFIX}/include/marble)
+           marble_export.h
+           DESTINATION ${CMAKE_INSTALL_PREFIX}/include/marble
+)
 
 
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #670497:670498
@@ -25,6 +25,7 @@
 #include <QtGui/QPixmap>
 #include <QtDesigner/QDesignerExportWidget>
 
+#include "marble_export.h"
 #include "katlasglobe.h"
 #include "katlascrosshair.h"
 #include "katlasmapscale.h"
@@ -66,7 +67,7 @@
  * @see KAtlasGlobe
  */
 
-class QDESIGNER_WIDGET_EXPORT MarbleWidget : public QWidget
+class MARBLE_EXPORT MarbleWidget : public QWidget
 {
     Q_OBJECT
 
--- trunk/KDE/kdeedu/marble/src/lib/katlasthemeselectview.h #670497:670498
@@ -22,8 +22,9 @@
 #include <QtGui/QStandardItemModel>
 #include <QtGui/QListView>
 
+#include "marble_export.h"
 
-class KAtlasThemeSelectView : public QListView
+class MARBLE_EXPORT KAtlasThemeSelectView : public QListView
 {
     Q_OBJECT
 
--- trunk/KDE/kdeedu/marble/src/lib/maptheme.h #670497:670498
@@ -17,6 +17,7 @@
 #include <QtCore/QObject>
 #include <QtGui/QColor>
 
+#include "marble_export.h"
 
 class QStandardItemModel;
 
@@ -30,7 +31,7 @@
 } DgmlLayer;
 
 
-class MapTheme : public QObject
+class MARBLE_EXPORT MapTheme : public QObject
 {
     Q_OBJECT
 
--- trunk/KDE/kdeedu/marble/src/lib/placemarkmodel.h #670497:670498
@@ -20,6 +20,7 @@
 
 #include <QtCore/QAbstractListModel>
 
+#include "marble_export.h"
 #include "placecontainer.h"
 
 
@@ -29,7 +30,7 @@
 }
 
 
-class PlaceMarkModel : public QAbstractListModel
+class MARBLE_EXPORT PlaceMarkModel : public QAbstractListModel
 {
     Q_OBJECT
 
--- trunk/KDE/kdeedu/marble/src/lib/searchlistview.h #670497:670498
@@ -16,8 +16,9 @@
 
 #include <QtGui/QListView>
 
+#include "marble_export.h"
 
-class SearchListView : public QListView
+class MARBLE_EXPORT SearchListView : public QListView
 {
     Q_OBJECT
 


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