Adjust qtlibspatcher to new pathnames, change purpose of qpatch

qpatch should not try to rename debug symbols, but modify the prl
files instead. This purely replaces forward-slashed pathes. The
pathes in the debugging symbols use backslashes and are not touched.

Reviewed-By: con

2 files changed, 49 insertions, 61 deletions

diff --git a/src/tools/qpatch/files-to-patch-windows b/src/tools/qpatch/files-to-patch-windows
index 38545a7def..a1fd431f9a 100644
--- a/src/tools/qpatch/files-to-patch-windows
+++ b/src/tools/qpatch/files-to-patch-windows
@@ -1,28 +1,27 @@
-bin/Qt3Supportd4.dll
+bin/qmake.exe
+bin/QtCore4.dll
 bin/QtCored4.dll
-bin/QtGuid4.dll
-bin/QtHelpd4.dll
-bin/QtMultimediad4.dll
-bin/QtNetworkd4.dll
-bin/QtOpenGLd4.dll
-bin/QtScriptd4.dll
-bin/QtScriptToolsd4.dll
-bin/QtSqld4.dll
-bin/QtSvgd4.dll
-bin/QtTestd4.dll
-bin/QtWebKitd4.dll
-bin/QtXmld4.dll
-bin/QtXmlPatternsd4.dll
-plugins/accessible/qtaccessiblecompatwidgetsd4.dll
-plugins/accessible/qtaccessiblewidgetsd4.dll
-plugins/codecs/qcncodecsd4.dll
-plugins/codecs/qjpcodecsd4.dll
-plugins/codecs/qkrcodecsd4.dll
-plugins/codecs/qtwcodecsd4.dll
-plugins/iconengines/qsvgicond4.dll
-plugins/imageformats/qgifd4.dll
-plugins/imageformats/qjpegd4.dll
-plugins/imageformats/qmngd4.dll
-plugins/imageformats/qsvgd4.dll
-plugins/imageformats/qtiffd4.dll
-plugins/sqldrivers/qsqlited4.dll
+%%
+mkspecs/default/qmake.conf
+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/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
diff --git a/src/tools/qtlibspatcher/qtlibspatchermain.cpp b/src/tools/qtlibspatcher/qtlibspatchermain.cpp
index b478c02dd9..bf92cb3c1a 100644
--- a/src/tools/qtlibspatcher/qtlibspatchermain.cpp
+++ b/src/tools/qtlibspatcher/qtlibspatchermain.cpp
@@ -38,7 +38,7 @@
 #include <QtCore/QDebug>
 
 #ifdef Q_OS_WIN
-#   define QT_INSTALL_DIR "C:/qt-greenhouse/Trolltech/Code_less_create_more/Trolltech/Code_less_create_more/Troll/4.5.0/qt";
+#   define QT_INSTALL_DIR "C:/qt-greenhouse/Trolltech/Code_less_create_more/Trolltech/Code_less_create_more/Troll/4.6/qt";
 
     const char * const oldInstallBase = QT_INSTALL_DIR;
     const char * const oldSourceBase = QT_INSTALL_DIR;
@@ -170,6 +170,7 @@ bool patchDebugLibrariesWithQtPath(const char *baseQtPath)
         { "/bin/QtGuid4.dll" },
         { "/bin/QtHelpd4.dll" },
         { "/bin/QtNetworkd4.dll" },
+        { "/bin/QtNetworkd4.dll" },
         { "/bin/QtOpenGLd4.dll" },
         { "/bin/QtScriptd4.dll" },
         { "/bin/QtScriptToolsd4.dll" },
@@ -179,20 +180,6 @@ bool patchDebugLibrariesWithQtPath(const char *baseQtPath)
         { "/bin/QtWebKitd4.dll" },
         { "/bin/QtXmld4.dll" },
         { "/bin/QtXmlPatternsd4.dll" },
-        { "/lib/Qt3Supportd4.dll" },
-        { "/lib/QtCored4.dll" },
-        { "/lib/QtGuid4.dll" },
-        { "/lib/QtHelpd4.dll" },
-        { "/lib/QtNetworkd4.dll" },
-        { "/lib/QtOpenGLd4.dll" },
-        { "/lib/QtScriptd4.dll" },
-        { "/lib/QtScriptToolsd4.dll" },
-        { "/lib/QtSqld4.dll" },
-        { "/lib/QtSvgd4.dll" },
-        { "/lib/QtTestd4.dll" },
-        { "/lib/QtWebKitd4.dll" },
-        { "/lib/QtXmld4.dll" },
-        { "/lib/QtXmlPatternsd4.dll" },
         { "/plugins/accessible/qtaccessiblecompatwidgetsd4.dll" },
         { "/plugins/accessible/qtaccessiblewidgetsd4.dll" },
         { "/plugins/codecs/qcncodecsd4.dll" },
@@ -445,26 +432,27 @@ bool patchDebugLibrariesWithQtPath(const char *baseQtPath)
         { "/examples/xmlpatterns/filetree/filetree" },
         { "/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel" },
         { "/examples/xmlpatterns/recipes/recipes" },
-        { "/lib/libQt3Support.so.4.5.0" },
-        { "/lib/libQtAssistantClient.so.4.5.0" },
-        { "/lib/libQtCLucene.so.4.5.0" },
-        { "/lib/libQtCore.so.4.5.0" },
-        { "/lib/libQtDBus.so.4.5.0" },
-        { "/lib/libQtDesigner.so.4.5.0" },
-        { "/lib/libQtDesignerComponents.so.4.5.0" },
-        { "/lib/libQtGui.so.4.5.0" },
-        { "/lib/libQtHelp.so.4.5.0" },
-        { "/lib/libQtNetwork.so.4.5.0" },
-        { "/lib/libQtOpenGL.so.4.5.0" },
-        { "/lib/libQtScript.so.4.5.0" },
-        { "/lib/libQtScriptTools.so.4.5.0" },
-        { "/lib/libQtSql.so.4.5.0" },
-        { "/lib/libQtSvg.so.4.5.0" },
-        { "/lib/libQtTest.so.4.5.0" },
+        { "/lib/libQt3Support.so" },
+        { "/lib/libQtAssistantClient.so" },
+        { "/lib/libQtCLucene.so" },
+        { "/lib/libQtCore.so" },
+        { "/lib/libQtDBus.so" },
+        { "/lib/libQtDesigner.so" },
+        { "/lib/libQtDesignerComponents.so" },
+        { "/lib/libQtGui.so" },
+        { "/lib/libQtHelp.so" },
+        { "/lib/libQtMultimedia.so" },
+        { "/lib/libQtNetwork.so" },
+        { "/lib/libQtOpenGL.so" },
+        { "/lib/libQtScript.so" },
+        { "/lib/libQtScriptTools.so" },
+        { "/lib/libQtSql.so" },
+        { "/lib/libQtSvg.so" },
+        { "/lib/libQtTest.so" },
         { "/lib/libQtUiTools.a" },
-        { "/lib/libQtWebKit.so.4.5.0" },
-        { "/lib/libQtXml.so.4.5.0" },
-        { "/lib/libQtXmlPatterns.so.4.5.0" },
+        { "/lib/libQtWebKit.so" },
+        { "/lib/libQtXml.so" },
+        { "/lib/libQtXmlPatterns.so" },
         { "/plugins/accessible/libqtaccessiblecompatwidgets.so" },
         { "/plugins/accessible/libqtaccessiblewidgets.so" },
         { "/plugins/codecs/libqcncodecs.so" },
@@ -572,6 +560,7 @@ const char * const textFileFileNames[] =
     "/lib/libQtDesigner.prl",
     "/lib/libQtGui.prl",
     "/lib/libQtHelp.prl",
+    "/lib/libQtMultimedia.prl",
     "/lib/libQtNetwork.prl",
     "/lib/libQtOpenGL.prl",
     "/lib/libQtScript.prl",