Skip to content
Browse files

Merge pull request #85 from blackberry-webworks/next

Requesting pull of next branch from bb-ww into bb for Ripple Framework
  • Loading branch information...
2 parents 853431e + 1ef9167 commit d311880ac2b2160634f34458a03311e0e80f85f4 Ken Wallis committed Dec 19, 2011
Showing with 48 additions and 2 deletions.
  1. +6 −1 Ripple/ripple.cpp
  2. +1 −1 config.ini
  3. +21 −0 dist-ci.xml
  4. +20 −0 dist-windows.xml
View
7 Ripple/ripple.cpp
@@ -104,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
2 config.ini
@@ -1,2 +1,2 @@
[Ripple]
-windowContent=http://developer.blackberry.com/html5/update/rippleui
+windowContent=http://developer.blackberry.com/ripple/
View
21 dist-ci.xml
@@ -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
20 dist-windows.xml
@@ -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>

0 comments on commit d311880

Please sign in to comment.
Something went wrong with that request. Please try again.