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

List:       kde-commits
Subject:    branches/extragear/graphics/digikam/1.0-databaseext
From:       Holger Foerster <hamsi2k () freenet ! de>
Date:       2010-03-27 20:43:03
Message-ID: 20100327204304.026A6AC881 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1108109 by foerster:

Applied patch from bug #232233 on B.K.O. .

 M  +1 -1      data/database/CMakeLists.txt  
 M  +1 -0      databaseserver/CMakeLists.txt  
 M  +1 -2      databaseserver/databaseserver.h  
 M  +1 -1      libs/database/databasecopymanager.h  
 M  +1 -1      libs/database/databaseserverstarter.h  
 M  +2 -3      libs/dialogs/migrationdlg.h  
 M  +1 -0      libs/widgets/common/databasewidget.cpp  
 M  +1 -2      libs/widgets/common/databasewidget.h  


--- branches/extragear/graphics/digikam/1.0-databaseext/data/database/CMakeLists.txt \
#1108108:1108109 @@ -1,6 +1,6 @@
 CONFIGURE_FILE(dbconfig.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/dbconfig.xml)
 
-INSTALL(FILES dbconfig.xml
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dbconfig.xml
 			  mysql-global.conf
         DESTINATION ${DATA_INSTALL_DIR}/digikam/database )
         
\ No newline at end of file
--- branches/extragear/graphics/digikam/1.0-databaseext/databaseserver/CMakeLists.txt \
#1108108:1108109 @@ -21,6 +21,7 @@
 KDE4_ADD_EXECUTABLE(digikamdatabaseserver ${digikamdatabaseserver_SRCS})
 
 TARGET_LINK_LIBRARIES(digikamdatabaseserver
+                      ${KDE4_KDECORE_LIBS}
 #                      ${KDE4_SOLID_LIBS}
 #                      ${KIPI_LIBRARIES}
 #                      ${KEXIV2_LIBRARIES}
--- branches/extragear/graphics/digikam/1.0-databaseext/databaseserver/databaseserver.h \
#1108108:1108109 @@ -32,13 +32,12 @@
 
 // Local includes
 
-#include "digikam_export.h"
 #include <pollthread.h>
 
 namespace Digikam
 {
 
-class DIGIKAM_EXPORT DatabaseServer : public QObject
+class DatabaseServer : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.digikam.DatabaseServer")
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/database/databasecopymanager.h \
#1108108:1108109 @@ -32,7 +32,7 @@
 
 namespace Digikam
 {
-    class DIGIKAM_EXPORT DatabaseCopyManager : public QObject
+    class DIGIKAM_DATABASE_EXPORT DatabaseCopyManager : public QObject
     {
         Q_OBJECT
 
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/database/databaseserverstarter.h \
#1108108:1108109 @@ -34,7 +34,7 @@
 
 #include "digikam_export.h"
 
-class DIGIKAM_EXPORT DatabaseServerStarter : public QObject
+class DIGIKAM_DATABASE_EXPORT DatabaseServerStarter : public QObject
 {
     Q_OBJECT
 
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/dialogs/migrationdlg.h \
#1108108:1108109 @@ -32,7 +32,6 @@
 #include <kdialog.h>
 
 // Local includes
-#include "digikam_export.h"
 #include "databasewidget.h"
 #include "databasebackend.h"
 #include "databasecopymanager.h"
@@ -40,7 +39,7 @@
 namespace Digikam
 {
 
-class DIGIKAM_EXPORT DatabaseCopyThread : public QThread
+class DatabaseCopyThread : public QThread
 {
         Q_OBJECT
 
@@ -58,7 +57,7 @@
 };
 
 
-class DIGIKAM_EXPORT MigrationDlg : public KDialog
+class MigrationDlg : public KDialog
 {
     Q_OBJECT
 
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/widgets/common/databasewidget.cpp \
#1108108:1108109 @@ -27,6 +27,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
+#include <ktemporaryfile.h>
 
 // QT includes
 #include <QGridLayout>
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/widgets/common/databasewidget.h \
#1108108:1108109 @@ -39,7 +39,6 @@
 #include <kurl.h>
 
 // Local includes
-#include "digikam_export.h"
 #include "albumsettings.h"
 #include "databaseparameters.h"
 
@@ -47,7 +46,7 @@
 {
 
 
-class DIGIKAM_EXPORT DatabaseWidget : public QWidget
+class DatabaseWidget : public QWidget
 {
     Q_OBJECT
 


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