Requesting pull of master from bb-ww into bb for Ripple Framework #86

Merged
merged 9 commits into from Dec 19, 2011
View
@@ -47,8 +47,10 @@ void Ripple::init(void)
setAttribute(Qt::WA_DeleteOnClose);
webViewInternal = new QtGraphicsStageWebView(this);
- webViewInternal->qtStageWebView()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
- webViewInternal->qtStageWebView()->settings()->enablePersistentStorage(_config->localStoragePath());
+ webViewInternal->qtStageWebView()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+ webViewInternal->qtStageWebView()->settings()->enablePersistentStorage(_config->localStoragePath());
+ webViewInternal->qtStageWebView()->settings()->setOfflineStoragePath(_config->localStoragePath());
+ webViewInternal->qtStageWebView()->settings()->setOfflineWebApplicationCachePath(_config->localStoragePath());
webViewInternal->qtStageWebView()->settings()->setOfflineStorageDefaultQuota(512000000);
webViewInternal->qtStageWebView()->settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, true);
webViewInternal->qtStageWebView()->settings()->setAttribute(QWebSettings::LocalContentCanAccessFileUrls, true);
@@ -102,7 +104,12 @@ void Ripple::init(void)
move(_config->windowPosition());
- webViewInternal->qtStageWebView()->load(QUrl(_config->toolingContent()));
+ //workaround in case the toolingContent point to a folder without end '/', append one, so the offline mode still works
+ QUrl url(_config->toolingContent());
+ QString path = url.path();
+ if ( url.toLocalFile().isEmpty() && !path.endsWith('/'))
+ url.setPath(path + "/");
+ webViewInternal->qtStageWebView()->load(url);
setCentralWidget(webViewInternal);
View
@@ -1,2 +1,2 @@
[Ripple]
-windowContent=http://developer.blackberry.com/html5/update/rippleui
+windowContent=http://developer.blackberry.com/ripple/
View
@@ -38,6 +38,27 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assemb
<include>QtOpenGL4.dll</include>
</includes>
</fileSet>
+
+ <!-- openssl-->
+ <fileSet>
+ <directory>${env.QTDIR}/openssl/win/bin</directory>
+ <outputDirectory>win</outputDirectory>
+ <includes>
+ <include>*.dll</include>
+ </includes>
+ </fileSet>
+
+ <!-- QT mobility-->
+ <fileSet>
+ <directory>${env.QT_MOBILITY_ROOT}/lib</directory>
+ <outputDirectory>win</outputDirectory>
+ <includes>
+ <include>QtLocation1.dll</include>
+ <include>QtMultimediaKit1.dll</include>
+ <include>QtSensors1.dll</include>
+ </includes>
+ </fileSet>
+
<fileSet>
<directory>${env.QTDIR}/plugins/imageformats</directory>
<outputDirectory>win/imageformats</outputDirectory>
View
@@ -38,6 +38,26 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assemb
<include>QtOpenGL4.dll</include>
</includes>
</fileSet>
+
+ <!-- openssl-->
+ <fileSet>
+ <directory>${env.QTDIR}/openssl/win/bin</directory>
+ <outputDirectory>win</outputDirectory>
+ <includes>
+ <include>*.dll</include>
+ </includes>
+ </fileSet>
+
+ <!-- QT mobility-->
+ <fileSet>
+ <directory>${env.QT_MOBILITY_ROOT}/lib</directory>
+ <outputDirectory>win</outputDirectory>
+ <includes>
+ <include>QtLocation1.dll</include>
+ <include>QtMultimediaKit1.dll</include>
+ <include>QtSensors1.dll</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>${env.QTDIR}/plugins/imageformats</directory>