diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-11-05 15:08:29 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-11-05 15:58:35 +0100 |
| commit | 7cbd0ceb3ab2fe1089886b92f834b8e93f88e03b (patch) | |
| tree | 9af67ba2cb34ec8182e3222d6f26f6b13d8511d2 | |
| parent | 02a1c4d84f7c382c207734fcbf27057a89b4028f (diff) | |
Patch multimedia lib, remove version qualifier from qtcore on linux
(cherry picked from commit 4cb5953e65f1b375c800f6b01bf2082e6c8f4515)
| -rw-r--r-- | src/tools/qpatch/files-to-patch-linux | 5 | ||||
| -rw-r--r-- | src/tools/qpatch/files-to-patch-windows | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/qpatch/files-to-patch-linux b/src/tools/qpatch/files-to-patch-linux index 0efa3be226d..2cf70c97291 100644 --- a/src/tools/qpatch/files-to-patch-linux +++ b/src/tools/qpatch/files-to-patch-linux @@ -1,5 +1,5 @@ bin/qmake -lib/libQtCore.so.4.5.2 +lib/libQtCore.so %% lib/libQtCore.la lib/libQt3Support.la @@ -7,6 +7,7 @@ lib/libQtCLucene.la lib/libQtDBus.la lib/libQtGui.la lib/libQtHelp.la +lib/libQtMultimedia.la lib/libQtNetwork.la lib/libQtOpenGL.la lib/libQtScript.la @@ -27,6 +28,7 @@ lib/libQtDesignerComponents.prl lib/libQtDesigner.prl lib/libQtGui.prl lib/libQtHelp.prl +lib/libQtMultimedia.prl lib/libQtNetwork.prl lib/libQtOpenGL.prl lib/libQtScript.prl @@ -47,6 +49,7 @@ 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 diff --git a/src/tools/qpatch/files-to-patch-windows b/src/tools/qpatch/files-to-patch-windows index c62825fd2ae..38545a7defc 100644 --- a/src/tools/qpatch/files-to-patch-windows +++ b/src/tools/qpatch/files-to-patch-windows @@ -2,6 +2,7 @@ bin/Qt3Supportd4.dll bin/QtCored4.dll bin/QtGuid4.dll bin/QtHelpd4.dll +bin/QtMultimediad4.dll bin/QtNetworkd4.dll bin/QtOpenGLd4.dll bin/QtScriptd4.dll |