Merge pull request #85 from blackberry-webworks/next

Requesting pull of next branch from bb-ww into bb for Ripple Framework
blackberry · Dec 19, 2011 · d311880 · d311880
2 parents 853431e + 1ef9167
commit d311880
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 2 deletions.
diff --git a/Ripple/ripple.cpp b/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);
 

diff --git a/config.ini b/config.ini
@@ -1,2 +1,2 @@
 [Ripple]
-windowContent=http://developer.blackberry.com/html5/update/rippleui
+windowContent=http://developer.blackberry.com/ripple/
diff --git a/dist-ci.xml b/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>

diff --git a/dist-windows.xml b/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>