used 'MAEMO' define to create 'non-virtual' 'VIRUAL_EVENT' table

instead of 'virtual' one, only for 'MAEMO'
Linux stays untouched - creates real 'virtual' table for FTS support

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index 9eca6c3b39b3dfdeb17c1815dfd6a1aa0ef2b016..9003faadabb02d501a0fc5ebb499fb2bb1f38a82 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -17,7 +17,7 @@
     <item row="0" column="0" >
      <widget class="QTabWidget" name="tabWidget" >
       <property name="currentIndex" >
-       <number>1</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="dayViewTab" >
        <attribute name="title" >
@@ -95,8 +95,8 @@
     <addaction name="actionAboutQt" />
     <addaction name="actionAboutApplication" />
    </widget>
-   <addaction name="menuFile" />
    <addaction name="menuAbout" />
+   <addaction name="menuFile" />
   </widget>
   <widget class="QStatusBar" name="statusbar" />
   <action name="actionImportSchedule" >

diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index 2d0ac8c22895d36af595f17a0bb873a2b77ddd39..eebde17bc867ea60b32cf5050a5417a9713241d2 100644 (file)
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -1,3 +1,4 @@
+include(../global.pri)
 TEMPLATE = lib
 TARGET = sql
 DESTDIR = ../bin

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 1eeff198048024fbe246b827d5cf777d09c7caac..065059063e2d5bfd8334b7d2c7a20cd34f575992 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -233,8 +233,11 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
             FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id) \
             FOREIGN KEY(xid_activity) REFERENCES ACTIVITY(id))");
 
-        // TBD Virtual tables compatibility (waiting for Marek). Temporary non virtual VIRTUAL_TABLE below: To be deleted
-/*        query.exec("CREATE VIRTUAL TABLE VIRTUAL_EVENT using fts3 ( \
+#ifdef MAEMO
+        // TBD: MAEMO Virtual tables compatibility (waiting for Marek).
+        // MAEMO sqlite Qt driver doesn't provide FTS support by default - use the following HACK
+        qDebug() << "MAEMO: Creating 'general', not 'virtual' table 'VIRTUAL_EVENT'";
+        query.exec("CREATE TABLE VIRTUAL_EVENT ( \
             xid_conference INTEGER  NOT NULL, \
             id INTEGER NOT NULL , \
             tag VARCHAR,title VARCHAR NOT NULL , \
@@ -242,8 +245,8 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
             abstract VARCHAR, \
             description VARCHAR, \
             PRIMARY KEY (xid_conference,id))");
-*/
-        query.exec("CREATE TABLE VIRTUAL_EVENT ( \
+#else
+        query.exec("CREATE VIRTUAL TABLE VIRTUAL_EVENT using fts3 ( \
             xid_conference INTEGER  NOT NULL, \
             id INTEGER NOT NULL , \
             tag VARCHAR,title VARCHAR NOT NULL , \
@@ -251,6 +254,7 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
             abstract VARCHAR, \
             description VARCHAR, \
             PRIMARY KEY (xid_conference,id))");
+#endif
 
         query.exec("CREATE TABLE EVENT_PERSON ( \
             xid_conference INTEGER NOT NULL , \