diff options
| author | dt <qtc-committer@nokia.com> | 2009-02-05 15:56:57 +0100 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2009-02-05 15:56:57 +0100 |
| commit | 5fcf35039fb301a22c75b59586a5719341041217 (patch) | |
| tree | a8757cb6be2bff388936b1f785264655cbed57d1 | |
| parent | fa4bab50759e36c6fbdb1baaf581bc2afacdf58d (diff) | |
| parent | bbef5052dc189b0178768665cce54759506df227 (diff) | |
| download | qt-creator-5fcf35039fb301a22c75b59586a5719341041217.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 | 5 | ||||
| -rw-r--r-- | tests/auto/cplusplus/ast/ast.pro | 5 | ||||
| -rw-r--r-- | tests/auto/cplusplus/semantic/semantic.pro | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/tools/qtlibspatcher/qtlibspatchermain.cpp b/src/tools/qtlibspatcher/qtlibspatchermain.cpp index 65ffe04928..ad4e3ae715 100644 --- a/src/tools/qtlibspatcher/qtlibspatchermain.cpp +++ b/src/tools/qtlibspatcher/qtlibspatchermain.cpp @@ -42,7 +42,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.4.3"; +# define QT_INSTALL_DIR "C:/qt-greenhouse/Trolltech/Code_less_create_more/Trolltech/Code_less_create_more/Troll/4.4.3/qt"; const char * const oldInstallBase = QT_INSTALL_DIR; const char * const oldSourceBase = QT_INSTALL_DIR; @@ -108,7 +108,8 @@ bool patchBinariesWithQtPathes(const char *baseQtPath) #ifdef Q_OS_WIN "/bin/qmake.exe", "/bin/QtCore4.dll", - "/bin/QtCored4.dll" + "/bin/QtCored4.dll", + "/lib/QtCored4.dll" #else "/bin/qmake", "/lib/libQtCore.so", diff --git a/tests/auto/cplusplus/ast/ast.pro b/tests/auto/cplusplus/ast/ast.pro index 39fd14105d..84733f97e6 100644 --- a/tests/auto/cplusplus/ast/ast.pro +++ b/tests/auto/cplusplus/ast/ast.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +TEMPLATE = app +CONFIG += qt warn_on console depend_includepath +QT = core testlib include(../shared/shared.pri) -QT = core SOURCES += tst_ast.cpp diff --git a/tests/auto/cplusplus/semantic/semantic.pro b/tests/auto/cplusplus/semantic/semantic.pro index 71a8b5fab5..37c013685f 100644 --- a/tests/auto/cplusplus/semantic/semantic.pro +++ b/tests/auto/cplusplus/semantic/semantic.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +TEMPLATE = app +CONFIG += qt warn_on console depend_includepath +QT = core testlib include(../shared/shared.pri) -QT = core SOURCES += tst_semantic.cpp |