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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/collection/sqlcollection
From:       Leo Franchi <lfranchi () gmail ! com>
Date:       2008-08-31 20:07:40
Message-ID: 1220213260.293017.8767.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 855450 by lfranchi:

don't accidentally enable mysql-e until it is build as part of the source


 M  +3 -3      CMakeLists.txt  
 M  +3 -3      SqlCollection.cpp  


--- trunk/extragear/multimedia/amarok/src/collection/sqlcollection/CMakeLists.txt #855449:855450
@@ -15,7 +15,7 @@
         ${KDE4_INCLUDE_DIR}
         ${STRIGI_INCLUDE_DIR}
         ${QT_INCLUDES}
-        ${MYSQL_INCLUDE_DIR}
+	#        ${MYSQL_INCLUDE_DIR}
         )
 
 ########### next target ###############
@@ -43,7 +43,7 @@
     SqlMeta.cpp 
     SqliteCollection.cpp
     ../../sqlite/sqlite3.c
-    MySqlEmbeddedCollection.cpp
+    #    MySqlEmbeddedCollection.cpp
    ${extra_src}
  )
 
@@ -60,7 +60,7 @@
     ${KDE4_KIO_LIBS}
     ${KDE4_THREADWEAVER_LIBRARIES}
     ${sqlite_deps}
-    ${MYSQL_EMBEDDED_LIBRARIES} crypt ssl
+    #   ${MYSQL_EMBEDDED_LIBRARIES} crypt ssl
 )
 
 if(APPLE)
--- trunk/extragear/multimedia/amarok/src/collection/sqlcollection/SqlCollection.cpp #855449:855450
@@ -25,7 +25,7 @@
 #include "SqlCollectionLocation.h"
 #include "SqlQueryMaker.h"
 #include "SqliteCollection.h"
-#include "MySqlEmbeddedCollection.h"
+//#include "MySqlEmbeddedCollection.h"
 //#include "mysqlcollection.h"
 
 #ifdef Q_OS_WIN32
@@ -62,8 +62,8 @@
             break;
     }*/
 // uncomment next to test MySQLe (and comment the next to next)
-    collection = new MySqlEmbeddedCollection( "localCollection", i18n( "Local Collection" ) );
-//    collection = new SqliteCollection( "localCollection", i18n( "Local Collection" ) );
+//    collection = new MySqlEmbeddedCollection( "localCollection", i18n( "Local Collection" ) );
+    collection = new SqliteCollection( "localCollection", i18n( "Local Collection" ) );
     emit newCollection( collection );
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]