Commit f7ed313f authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer

Upgrade qtlibspatcher to patch Qt 4.5.0

Was failing because it still tried to patch Qt 4.4.3
parent 512c5a06
......@@ -47,8 +47,8 @@
const char * const oldInstallBase = QT_INSTALL_DIR;
const char * const oldSourceBase = QT_INSTALL_DIR;
#else
const char * const oldSourceBase = "/home/berlin/dev/qt-4.4.3-temp/qt-x11-opensource-src-4.4.3";
const char * const oldInstallBase = "/home/berlin/dev/qt-4.4.3-shipping/qt";
const char * const oldSourceBase = "/home/berlin/dev/qt-4.5.0-temp/qt-x11-opensource-src-4.5.0";
const char * const oldInstallBase = "/home/berlin/dev/qt-4.5.0-shipping/qt";
#endif
......@@ -437,24 +437,24 @@ bool patchDebugLibrariesWithQtPath(const char *baseQtPath)
{"/examples/script/defaultprototypes/defaultprototypes.debug", "/examples/script/defaultprototypes"},
{"/examples/script/qscript/qscript.debug", "/examples/script/qscript"},
{"/examples/script/tetrix/tetrix.debug", "/examples/script/tetrix"},
{"/lib/libQtTest.so.4.4.3.debug", "/lib"},
{"/lib/libQtDesignerComponents.so.4.4.3.debug", "/lib"},
{"/lib/libQtScript.so.4.4.3.debug", "/lib"},
{"/lib/libQtDesigner.so.4.4.3.debug", "/lib"},
{"/lib/libQtGui.so.4.4.3.debug", "/lib"},
{"/lib/libQtSvg.so.4.4.3.debug", "/lib"},
{"/lib/libQtXml.so.4.4.3.debug", "/lib"},
{"/lib/libQtCLucene.so.4.4.3.debug", "/lib"},
{"/lib/libQtCore.so.4.4.3.debug", "/lib"},
{"/lib/libQtDBus.so.4.4.3.debug", "/lib"},
{"/lib/libQtXmlPatterns.so.4.4.3.debug", "/lib"},
{"/lib/libQtHelp.so.4.4.3.debug", "/lib"},
{"/lib/libQtSql.so.4.4.3.debug", "/lib"},
{"/lib/libQtNetwork.so.4.4.3.debug", "/lib"},
{"/lib/libQtOpenGL.so.4.4.3.debug", "/lib"},
{"/lib/libQt3Support.so.4.4.3.debug", "/lib"},
{"/lib/libQtAssistantClient.so.4.4.3.debug", "/lib"},
{"/lib/libQtWebKit.so.4.4.3.debug", "/lib"},
{"/lib/libQtTest.so.4.5.0.debug", "/lib"},
{"/lib/libQtDesignerComponents.so.4.5.0.debug", "/lib"},
{"/lib/libQtScript.so.4.5.0.debug", "/lib"},
{"/lib/libQtDesigner.so.4.5.0.debug", "/lib"},
{"/lib/libQtGui.so.4.5.0.debug", "/lib"},
{"/lib/libQtSvg.so.4.5.0.debug", "/lib"},
{"/lib/libQtXml.so.4.5.0.debug", "/lib"},
{"/lib/libQtCLucene.so.4.5.0.debug", "/lib"},
{"/lib/libQtCore.so.4.5.0.debug", "/lib"},
{"/lib/libQtDBus.so.4.5.0.debug", "/lib"},
{"/lib/libQtXmlPatterns.so.4.5.0.debug", "/lib"},
{"/lib/libQtHelp.so.4.5.0.debug", "/lib"},
{"/lib/libQtSql.so.4.5.0.debug", "/lib"},
{"/lib/libQtNetwork.so.4.5.0.debug", "/lib"},
{"/lib/libQtOpenGL.so.4.5.0.debug", "/lib"},
{"/lib/libQt3Support.so.4.5.0.debug", "/lib"},
{"/lib/libQtAssistantClient.so.4.5.0.debug", "/lib"},
{"/lib/libQtWebKit.so.4.5.0.debug", "/lib"},
{"/demos/spreadsheet/spreadsheet.debug", "/demos/spreadsheet"},
{"/demos/composition/composition.debug", "/demos/composition"},
{"/demos/gradients/gradients.debug", "/demos/gradients"},
......@@ -533,24 +533,24 @@ bool patchDebugLibrariesWithQtPath(const char *baseQtPath)
{"/examples/script/calculator/calculator.debug", "/tools/designer/src/uitools"},
{"/examples/script/tetrix/tetrix.debug", "/tools/designer/src/uitools"},
{"/lib/libQtTest.so.4.4.3.debug", "/src/testlib"},
{"/lib/libQtDesignerComponents.so.4.4.3.debug", "/tools/designer/src/components"},
{"/lib/libQtScript.so.4.4.3.debug", "/src/script"},
{"/lib/libQtDesigner.so.4.4.3.debug", "/tools/designer/src/lib"},
{"/lib/libQtGui.so.4.4.3.debug", "/src/gui"},
{"/lib/libQtSvg.so.4.4.3.debug", "/src/svg"},
{"/lib/libQtXml.so.4.4.3.debug", "/src/xml"},
{"/lib/libQtCLucene.so.4.4.3.debug", "/tools/assistant/lib/fulltextsearch"},
{"/lib/libQtCore.so.4.4.3.debug", "/src/corelib"},
{"/lib/libQtDBus.so.4.4.3.debug", "/src/dbus"},
{"/lib/libQtXmlPatterns.so.4.4.3.debug", "/src/xmlpatterns"},
{"/lib/libQtHelp.so.4.4.3.debug", "/tools/assistant/lib"},
{"/lib/libQtSql.so.4.4.3.debug", "/src/sql"},
{"/lib/libQtNetwork.so.4.4.3.debug", "/src/network"},
{"/lib/libQtOpenGL.so.4.4.3.debug", "/src/opengl"},
{"/lib/libQt3Support.so.4.4.3.debug", "/src/qt3support"},
{"/lib/libQtAssistantClient.so.4.4.3.debug", "/tools/assistant/compat/lib"},
{"/lib/libQtWebKit.so.4.4.3.debug", "/src/3rdparty/webkit/WebCore"},
{"/lib/libQtTest.so.4.5.0.debug", "/src/testlib"},
{"/lib/libQtDesignerComponents.so.4.5.0.debug", "/tools/designer/src/components"},
{"/lib/libQtScript.so.4.5.0.debug", "/src/script"},
{"/lib/libQtDesigner.so.4.5.0.debug", "/tools/designer/src/lib"},
{"/lib/libQtGui.so.4.5.0.debug", "/src/gui"},
{"/lib/libQtSvg.so.4.5.0.debug", "/src/svg"},
{"/lib/libQtXml.so.4.5.0.debug", "/src/xml"},
{"/lib/libQtCLucene.so.4.5.0.debug", "/tools/assistant/lib/fulltextsearch"},
{"/lib/libQtCore.so.4.5.0.debug", "/src/corelib"},
{"/lib/libQtDBus.so.4.5.0.debug", "/src/dbus"},
{"/lib/libQtXmlPatterns.so.4.5.0.debug", "/src/xmlpatterns"},
{"/lib/libQtHelp.so.4.5.0.debug", "/tools/assistant/lib"},
{"/lib/libQtSql.so.4.5.0.debug", "/src/sql"},
{"/lib/libQtNetwork.so.4.5.0.debug", "/src/network"},
{"/lib/libQtOpenGL.so.4.5.0.debug", "/src/opengl"},
{"/lib/libQt3Support.so.4.5.0.debug", "/src/qt3support"},
{"/lib/libQtAssistantClient.so.4.5.0.debug", "/tools/assistant/compat/lib"},
{"/lib/libQtWebKit.so.4.5.0.debug", "/src/3rdparty/webkit/WebCore"},
{"/demos/composition/composition.debug", "/demos/shared"},
{"/demos/gradients/gradients.debug", "/demos/shared"},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment