summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2012-01-30 10:22:37 +0200
committerNiels Weber <niels.2.weber@nokia.com>2012-01-30 10:14:23 +0100
commit95323b8e7946f3d62b3e36ec9de630780321b03e (patch)
tree55f491837008ee987c32b925d2ae4bfd661ca735
parent70cc8ce0e1bd2beb15007045b99b26f6c6956206 (diff)
Qt binary patch operation for embedded linux arm target.
Add new binary patch operation for embedded linux arm targets. New keyword added and corresponding resource file that lists files which need patching. Change-Id: Icab6541939fe44fd10b19358d7dbebf62d4e3e3d Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
-rw-r--r--installerbuilder/libinstaller/qtpatchoperation.cpp2
-rw-r--r--installerbuilder/libinstaller/resources/files-to-patch-linux-emb-arm70
2 files changed, 72 insertions, 0 deletions
diff --git a/installerbuilder/libinstaller/qtpatchoperation.cpp b/installerbuilder/libinstaller/qtpatchoperation.cpp
index 5f78b52c7..68d182d2c 100644
--- a/installerbuilder/libinstaller/qtpatchoperation.cpp
+++ b/installerbuilder/libinstaller/qtpatchoperation.cpp
@@ -184,6 +184,8 @@ bool QtPatchOperation::performOperation()
patchFileListFile.setFileName(QLatin1String(":/files-to-patch-windows"));
else if (type == QLatin1String("linux"))
patchFileListFile.setFileName(QLatin1String(":/files-to-patch-linux"));
+ else if (type == QLatin1String("linux-emb-arm"))
+ patchFileListFile.setFileName(QLatin1String(":/files-to-patch-linux-emb-arm"));
else if (type == QLatin1String("mac"))
patchFileListFile.setFileName(QLatin1String(":/files-to-patch-macx"));
diff --git a/installerbuilder/libinstaller/resources/files-to-patch-linux-emb-arm b/installerbuilder/libinstaller/resources/files-to-patch-linux-emb-arm
new file mode 100644
index 000000000..0ae1605de
--- /dev/null
+++ b/installerbuilder/libinstaller/resources/files-to-patch-linux-emb-arm
@@ -0,0 +1,70 @@
+bin/qmake
+bin/lrelease
+%%
+lib/libQtCore.la
+lib/libQt3Support.la
+lib/libQtCLucene.la
+lib/libQtDBus.la
+lib/libQtDeclarative.la
+lib/libQtGui.la
+lib/libQtHelp.la
+lib/libQtMultimedia.la
+lib/libQtNetwork.la
+lib/libQtOpenGL.la
+lib/libphonon.la
+lib/libQtScript.la
+lib/libQtScriptTools.la
+lib/libQtSql.la
+lib/libQtSvg.la
+lib/libQtTest.la
+lib/libQtWebKit.la
+lib/libQtXml.la
+lib/libQtXmlPatterns.la
+demos/shared/libdemo_shared.prl
+lib/libQt3Support.prl
+lib/libQtAssistantClient.prl
+lib/libQtCLucene.prl
+lib/libQtCore.prl
+lib/libQtDBus.prl
+lib/libQtDesignerComponents.prl
+lib/libQtDesigner.prl
+lib/libQtDeclarative.prl
+lib/libQtGui.prl
+lib/libQtHelp.prl
+lib/libQtMultimedia.prl
+lib/libQtNetwork.prl
+lib/libQtOpenGL.prl
+lib/libQtScript.prl
+lib/libQtScriptTools.prl
+lib/libQtSql.prl
+lib/libQtSvg.prl
+lib/libQtTest.prl
+lib/libQtUiTools.prl
+lib/libQtWebKit.prl
+lib/libQtXmlPatterns.prl
+lib/libQtXml.prl
+lib/libphonon.prl
+lib/libqtmain.prl
+lib/pkgconfig/phonon.pc
+lib/pkgconfig/Qt3Support.pc
+lib/pkgconfig/QtAssistantClient.pc
+lib/pkgconfig/QtCLucene.pc
+lib/pkgconfig/QtCore.pc
+lib/pkgconfig/QtDBus.pc
+lib/pkgconfig/QtDeclarative.pc
+lib/pkgconfig/QtDesignerComponents.pc
+lib/pkgconfig/QtDesigner.pc
+lib/pkgconfig/QtGui.pc
+lib/pkgconfig/QtHelp.pc
+lib/pkgconfig/QtMultimedia.pc
+lib/pkgconfig/QtNetwork.pc
+lib/pkgconfig/QtOpenGL.pc
+lib/pkgconfig/QtScript.pc
+lib/pkgconfig/QtScriptTools.pc
+lib/pkgconfig/QtSql.pc
+lib/pkgconfig/QtSvg.pc
+lib/pkgconfig/QtTest.pc
+lib/pkgconfig/QtUiTools.pc
+lib/pkgconfig/QtWebKit.pc
+lib/pkgconfig/QtXmlPatterns.pc
+lib/pkgconfig/QtXml.pc