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

List:       kde-commits
Subject:    KDE/kdepimlibs/akonadi
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2011-01-10 9:57:15
Message-ID: 20110110095715.1DCB9AC8B2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1213405 by tokoe:

Fix collection dialog for WinCE platform

The qrc system is broken on WinCE, so install the QML
file on the filesystem and load it old-style.


 M  +7 -1      CMakeLists.txt  
 M  +1 -1      collectiondialog_mobile.cpp  
 D             collectiondialog_mobile.qrc  


--- trunk/KDE/kdepimlibs/akonadi/CMakeLists.txt #1213404:1213405
@@ -229,7 +229,6 @@
   kde4_add_ui_files( akonadikde_LIB_SRC
     collectiongeneralpropertiespage_mobile.ui
   )
-  qt4_add_resources( akonadikde_LIB_SRC collectiondialog_mobile.qrc )
 else(KDEPIM_MOBILE_UI)
   kde4_add_ui_files( akonadikde_LIB_SRC
     collectiongeneralpropertiespage.ui
@@ -373,3 +372,10 @@
   kcfg2dbus.xsl
   DESTINATION ${DATA_INSTALL_DIR}/akonadi-kde
 )
+
+if (KDEPIM_MOBILE_UI)
+install( FILES
+  CollectionDialogMobile.qml
+  DESTINATION ${DATA_INSTALL_DIR}/akonadi-kde/qml
+)
+endif(KDEPIM_MOBILE_UI)
--- trunk/KDE/kdepimlibs/akonadi/collectiondialog_mobile.cpp #1213404:1213405
@@ -107,7 +107,7 @@
   mView->rootContext()->setContextProperty( QLatin1String( "cancelButtonText" ), \
KStandardGuiItem::cancel().text().remove( QLatin1Char( '&' ) ) );  \
mView->rootContext()->setContextProperty( QLatin1String( "createButtonText" ), i18n( \
"&New Subfolder..." ).remove( QLatin1Char( '&' ) ) );  
-  mView->setSource( QUrl( QLatin1String( "qrc:/CollectionDialogMobile.qml" ) ) );
+  mView->setSource( QUrl::fromLocalFile( KStandardDirs::locate( "data", \
QLatin1String( "akonadi-kde/qml/CollectionDialogMobile.qml" ) ) ) );  
 #if defined (Q_WS_MAEMO_5) || defined (Q_OS_WINCE)
   mParent->setWindowState( Qt::WindowFullScreen );


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