diff options
author | hjk <qtc-committer@nokia.com> | 2009-02-05 12:36:27 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2009-02-05 12:36:27 +0100 |
commit | 147859439dd10cc278ef339a33dc4812d5aeed67 (patch) | |
tree | 90d29e1336b47c681e6d501a268b117ef8287c02 | |
parent | bf7dae57dec51ac2c1997297874295c69980b3e7 (diff) | |
parent | 2f24b3965f5808644364c937765f823b34a46828 (diff) | |
download | qt-creator-147859439dd10cc278ef339a33dc4812d5aeed67.tar.gz |
Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
-rw-r--r-- | src/tools/qtlibspatcher/qtlibspatchermain.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/tools/qtlibspatcher/qtlibspatchermain.cpp b/src/tools/qtlibspatcher/qtlibspatchermain.cpp index b66a35f294..65ffe04928 100644 --- a/src/tools/qtlibspatcher/qtlibspatchermain.cpp +++ b/src/tools/qtlibspatcher/qtlibspatchermain.cpp @@ -136,7 +136,6 @@ char * allocFileNameCopyAppend(const char * textToCopy, Q_ASSERT(textToAppend != NULL); if (textToAppend2 == NULL) textToAppend2 = ""; - Q_ASSERT(textToAppend2 != NULL); char * const res = new char[bytesToAllocate]; const size_t textToCopyLen = strlen(textToCopy); @@ -153,7 +152,7 @@ char * allocFileNameCopyAppend(const char * textToCopy, if (textToAppendLen > 0) strncpy(res + textToCopyLen, textToAppend, bytesToAllocate - textToCopyLen - 1); if (textToAppend2Len > 0) - strncpy(res + textToCopyLen + textToAppend2Len, textToAppend2, bytesToAllocate - textToCopyLen - textToAppend2Len - 1); + strncpy(res + textToCopyLen + textToAppendLen, textToAppend2, bytesToAllocate - textToCopyLen - textToAppendLen - 1); res[textToCopyLen + textToAppendLen + textToAppend2Len] = '\0'; res[bytesToAllocate - 1] = '\0'; // Safe is safe return res; @@ -183,6 +182,19 @@ bool patchDebugLibrariesWithQtPath(const char *baseQtPath) {"/bin/QtWebKitd4.dll", "/src/3rdparty/webkit/WebCore/"}, {"/bin/QtXmld4.dll", "/src/xml/"}, {"/bin/QtXmlPatternsd4.dll", "/src/xmlpatterns/"}, + {"/lib/Qt3Supportd4.dll", "/src/qt3support/"}, + {"/lib/QtCored4.dll", "/src/corelib/"}, + {"/lib/QtGuid4.dll", "/src/gui/"}, + {"/lib/QtHelpd4.dll", "/tools/assistant/lib/"}, + {"/lib/QtNetworkd4.dll", "/src/network/"}, + {"/lib/QtOpenGLd4.dll", "/src/opengl/"}, + {"/lib/QtScriptd4.dll", "/src/script/"}, + {"/lib/QtSqld4.dll", "/src/sql/"}, + {"/lib/QtSvgd4.dll", "/src/svg/"}, + {"/lib/QtTestd4.dll", "/src/testlib/"}, + {"/lib/QtWebKitd4.dll", "/src/3rdparty/webkit/WebCore/"}, + {"/lib/QtXmld4.dll", "/src/xml/"}, + {"/lib/QtXmlPatternsd4.dll", "/src/xmlpatterns/"}, {"/plugins/accessible/qtaccessiblecompatwidgetsd4.dll", "/src/plugins/accessible/compat/"}, {"/plugins/accessible/qtaccessiblewidgetsd4.dll", "/src/plugins/accessible/widgets/"}, {"/plugins/codecs/qcncodecsd4.dll", "/src/plugins/codecs/cn/"}, |