From c064509db928d6538ebb7d53a1ad03fcc7025b4d Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Tue, 19 Mar 2013 20:08:34 +0200 Subject: Update files-to-patch files Updated existing Qt4 specific files and added embedded specific files. Change-Id: I0a23816ce8288b6c635d667bc51854299fba54a1 Reviewed-by: Tim Jenssen --- src/libs/installer/resources/files-to-patch-linux | 74 ++-------------------- .../resources/files-to-patch-linux-emb-arm | 8 +++ src/libs/installer/resources/files-to-patch-macx | 48 ++------------ .../installer/resources/files-to-patch-windows | 57 ++--------------- .../resources/files-to-patch-windows-emb-arm | 7 ++ 5 files changed, 32 insertions(+), 162 deletions(-) create mode 100644 src/libs/installer/resources/files-to-patch-linux-emb-arm create mode 100644 src/libs/installer/resources/files-to-patch-windows-emb-arm diff --git a/src/libs/installer/resources/files-to-patch-linux b/src/libs/installer/resources/files-to-patch-linux index 9c7b39f4a..760127f99 100644 --- a/src/libs/installer/resources/files-to-patch-linux +++ b/src/libs/installer/resources/files-to-patch-linux @@ -2,71 +2,9 @@ bin/qmake bin/lrelease lib/libQtCore.so %% -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 -mkspecs/qconfig.pri +*.la +*.prl +*.pc +*.pri +mkspecs/default-host/qmake.conf + diff --git a/src/libs/installer/resources/files-to-patch-linux-emb-arm b/src/libs/installer/resources/files-to-patch-linux-emb-arm new file mode 100644 index 000000000..ea400d715 --- /dev/null +++ b/src/libs/installer/resources/files-to-patch-linux-emb-arm @@ -0,0 +1,8 @@ +bin/qmake +bin/lrelease +%% +*.la +*.prl +*.pc +*.pri + diff --git a/src/libs/installer/resources/files-to-patch-macx b/src/libs/installer/resources/files-to-patch-macx index 28b19fb7c..20644f2d1 100644 --- a/src/libs/installer/resources/files-to-patch-macx +++ b/src/libs/installer/resources/files-to-patch-macx @@ -17,46 +17,8 @@ bin/qhelpconverter.app/Contents/MacOS/qhelpconverter bin/QMLViewer.app/Contents/MacOS/QMLViewer bin/qttracereplay.app/Contents/MacOS/qttracereplay %% -lib/QtCore.la -lib/libQtCLucene.la -lib/QtDeclarative.la -lib/QtGui.la -lib/QtHelp.la -lib/QtMultimedia.la -lib/QtNetwork.la -lib/QtOpenGL.la -lib/phonon.la -lib/QtScript.la -lib/QtScriptTools.la -lib/QtSql.la -lib/QtSvg.la -lib/QtTest.la -lib/QtWebKit.la -lib/QtXml.la -lib/QtXmlPatterns.la -lib/libQtCLucene.prl -lib/libQtUiTools.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 -mkspecs/qconfig.pri +*.la +*.prl +*.pc +*.pri +mkspecs/default-host/qmake.conf \ No newline at end of file diff --git a/src/libs/installer/resources/files-to-patch-windows b/src/libs/installer/resources/files-to-patch-windows index 845a299ce..6f931ec4f 100644 --- a/src/libs/installer/resources/files-to-patch-windows +++ b/src/libs/installer/resources/files-to-patch-windows @@ -6,55 +6,10 @@ lib/QtCore4.dll lib/QtCored4.dll %% mkspecs/default/qmake.conf -demos/shared/libdemo_shared.prl -lib/Qt3Support.prl -lib/QtAssistantClient.prl -lib/QtCLucene.prl -lib/QtCore.prl -lib/QtDesignerComponents.prl -lib/QtDesigner.prl -lib/QtGui.prl -lib/QtHelp.prl -lib/QtMultimedia.prl -lib/QtNetwork.prl -lib/QtOpenGL.prl -lib/QtScript.prl -lib/QtScriptTools.prl -lib/QtSql.prl -lib/QtSvg.prl -lib/QtTest.prl -lib/QtUiTools.prl -lib/QtWebKit.prl -lib/QtXmlPatterns.prl -lib/QtXml.prl -lib/Qt3Supportd.prl -lib/QtAssistantClientd.prl -lib/QtCLucened.prl -lib/QtCored.prl -lib/QtDesignerComponentsd.prl -lib/QtDesignerd.prl -lib/QtGuid.prl -lib/QtHelpd.prl -lib/QtMultimediad.prl -lib/QtNetworkd.prl -lib/QtOpenGLd.prl -lib/QtScriptd.prl -lib/QtScriptToolsd.prl -lib/QtSqld.prl -lib/QtSvgd.prl -lib/QtTestd.prl -lib/QtUiToolsd.prl -lib/QtWebKitd.prl -lib/QtXmlPatternsd.prl -lib/QtXmld.prl -lib/phonon.prl -lib/phonond.prl -lib/QtDeclarative.prl -lib/QtDeclaratived.prl -lib/qtmain.prl -lib/qtmaind.prl -lib/QAxContainer.prl -lib/QAxContainerd.prl -lib/QAxServer.prl -lib/QAxServerd.prl +mkspecs/default-host/qmake.conf .qmake.cache +*.prl +*.pc +*.la +*.pri +lib/prl.txt diff --git a/src/libs/installer/resources/files-to-patch-windows-emb-arm b/src/libs/installer/resources/files-to-patch-windows-emb-arm new file mode 100644 index 000000000..6ff8f9903 --- /dev/null +++ b/src/libs/installer/resources/files-to-patch-windows-emb-arm @@ -0,0 +1,7 @@ +bin/qmake.exe +bin/lrelease.exe +%% +*.la +*.prl +*.pc +*.pri -- cgit v1.2.3