QtComponents/Butaca - Revision history

imported_>inean: /* Adapt Packing files */

2011-09-13T19:33:05Z

Adapt Packing files

← Older revision		Revision as of 19:33, 13 September 2011
Line 324:		Line 324:
	- libqtwebkit-dev		- libqtwebkit-dev
	+Build-Depends: debhelper (>= 5), cdbs,		+Build-Depends: debhelper (>= 5), cdbs,
	+ libqt4-dev, libqt4-webkit-dev		+ libqt4-dev, libqt4-webkit-dev, quilt
	Standards-Version: 3.8.4		Standards-Version: 3.8.4
	XB-Maemo-Flags: visible		XB-Maemo-Flags: visible

2011-09-13T19:24:54Z

Applauncherd

← Older revision		Revision as of 19:24, 13 September 2011
Line 29:		Line 29:
	- QApplication *app = MDeclarativeCache::qApplication(argc, argv);		- QApplication *app = MDeclarativeCache::qApplication(argc, argv);
	- QDeclarativeView *view = MDeclarativeCache::qDeclarativeView();		- QDeclarativeView *view = MDeclarativeCache::qDeclarativeView();
	+ QApplication app ~~= QApplication~~(argc, argv);		+ QApplication app(argc, argv);
	+ QDeclarativeView view ~~= QDeclarativeView()~~;		+ QDeclarativeView view;

	- QDeclarativeContext *context = view->rootContext();		- QDeclarativeContext *context = view->rootContext();
Line 41:		Line 41:
	+ view.showFullScreen();		+ view.showFullScreen();

	int result = app->exec();		- int result = app->exec();
			+ int result = app.exec();

	delete controller;		delete controller;

2011-09-13T18:51:55Z

Adapt Packing files

← Older revision		Revision as of 18:51, 13 September 2011
Line 323:		Line 323:
	- libqtwebkit-dev		- libqtwebkit-dev
	+Build-Depends: debhelper (>= 5), cdbs,		+Build-Depends: debhelper (>= 5), cdbs,
	+ libqt4-dev, ~~libqtwebkit~~-dev		+ libqt4-dev, libqt4-webkit-dev
	Standards-Version: 3.8.4		Standards-Version: 3.8.4
	XB-Maemo-Flags: visible		XB-Maemo-Flags: visible

2011-09-13T18:41:24Z

Update packing scripts

← Older revision		Revision as of 18:41, 13 September 2011
Line 296:		Line 296:
	and copy generated files into debian/patches directory.		and copy generated files into debian/patches directory.

	Finally, modify rules file at debian directory to merge patches. At ~~'''config-stamp''' rule~~ add:		Finally, modify rules file at debian directory to merge patches. At cdbs rules definition add:
	<syntaxhighlight lang="make">include /usr/share/cdbs/1/rules/simple-patchsys.mk		<syntaxhighlight lang="make">include /usr/share/cdbs/1/rules/simple-patchsys.mk
	</syntaxhighlight>		</syntaxhighlight>

2011-09-13T18:40:48Z

Update packing scripts

← Older revision		Revision as of 18:40, 13 September 2011
Line 297:		Line 297:

	Finally, modify rules file at debian directory to merge patches. At '''config-stamp''' rule add:		Finally, modify rules file at debian directory to merge patches. At '''config-stamp''' rule add:
	<syntaxhighlight lang="make">~~for p in debian~~/~~patches~~/*; do patch -~~p1 < $$p; done~~		<syntaxhighlight lang="make">include /usr/share/cdbs/1/rules/simple-patchsys.mk
	</syntaxhighlight>		</syntaxhighlight>

2011-09-13T18:31:50Z

Update packing scripts

@@ Line 298: / Line 298: @@
 Finally, modify rules file at debian directory to merge patches. At '''config-stamp''' rule add:
 <syntaxhighlight lang="make">for p in debian/patches/*; do patch -p1 < $$p; done
 </syntaxhighlight>
 And thats all. You have '''Butaca''' working on Maemo5

2011-09-13T18:31:30Z

Adapt deployment to Fremantle

← Older revision		Revision as of 18:31, 13 September 2011
Line 287:		Line 287:

	INSTALLS += butacascript desktop icon splash		INSTALLS += butacascript desktop icon splash
	~~</syntaxhighlight>~~

	~~==== Adapt Packing files ====~~
	~~Set debhelper from 7 to 5 and remove unused deps~~

	~~<syntaxhighlight lang="diff">~~
	~~diff --git a/debian/compat b/debian/compat~~
	~~index 7f8f011..7ed6ff8 100644~~
	~~--- a/debian/compat~~
	~~+++ b/debian/compat~~
	~~@@ -1 +1 @@~~
	-7
	+5
	~~diff --git a/debian/control b/debian/control~~
	~~index 374197b..d1711dd 100644~~
	~~--- a/debian/control~~
	~~+++ b/debian/control~~
	~~@@ -2,9 +2,8 @@ Source: butaca~~
	~~Section: user/network~~
	~~Priority: extra~~
	~~Maintainer: Simon Pena <spena@igalia.com>~~
	~~-Build-Depends: debhelper (>= 7), applauncherd-dev, cdbs,~~
	~~- libqt4-dev, maemo-meegotouch-interfaces-dev, libmdatauri-dev,~~
	~~- libqtwebkit-dev~~
	~~+Build-Depends: debhelper (>= 5), cdbs,~~
	~~+ libqt4-dev, libqtwebkit-dev~~
	~~Standards-Version: 3.8.4~~
	~~XB-Maemo-Flags: visible~~
	~~XB-Homepage: https://projects.developer.nokia.com/butaca/~~
	</syntaxhighlight>		</syntaxhighlight>

2011-09-13T18:30:56Z

Adapt deployment to Fremantle

@@ Line 244: / Line 244: @@
 Some changes on how '''Butaca''' is deployed are needed to match Fremantle requirements.
-=== Optify code ===
+=== Deployment ===
-=== Update Desktop file ===
+==== Optify ====
-And finally, update desktop file. There's no applauncerd on fremantle, so remove invoker from Exec. With this action we loose splash-screen.
+Point binary to /opt and adapt paths to Fremantle
 commit

2011-09-13T18:20:45Z

Handle Close events

← Older revision		Revision as of 18:20, 13 September 2011
Line 225:		Line 225:

	<syntaxhighlight lang="diff">		<syntaxhighlight lang="diff">
			diff --git a/src/main.cpp b/src/main.cpp
			index 8f1c989..2fef2c3 100644
			--- a/src/main.cpp
			+++ b/src/main.cpp
			@@ -32,6 +32,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
			ButacaController *controller = new ButacaController(context);

			view.setSource(QUrl("qrc:/qml/main.qml"));
			+ QObject::connect((QObject*)view.engine(), SIGNAL(quit()), &app, SLOT(quit()));
			view.showFullScreen();

			int result = app->exec();
	</syntaxhighlight>		</syntaxhighlight>

2011-09-13T18:08:29Z

Refactor QML files

@@ Line 181: / Line 181: @@
 == Refactor QML files ==
-As on [QtComponents/Miniature], we need to replace namespace by the fremantle one. In this case we need to go a bit further use [[migrateTo]] for this task.
+As on [QtComponents/Miniature], we need to replace namespace by the fremantle one. In this case we need to go a bit further.
-=== Update hardcoded paths ===
+=== Update namespace ===
 === Remove QtQuick 1.1 code ===
 commit.
 == Handle Close events ==