From bf7dae57dec51ac2c1997297874295c69980b3e7 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 5 Feb 2009 12:35:37 +0100 Subject: Fixes: remove use of qttest_p4.prf Details: makes it compile now with Qt snapshots --- tests/auto/cplusplus/ast/ast.pro | 5 +++-- tests/auto/cplusplus/semantic/semantic.pro | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 -- cgit v1.2.1 From bbef5052dc189b0178768665cce54759506df227 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 5 Feb 2009 15:06:07 +0100 Subject: Fixes: Also Patch QtCore dll in /lib on windows, specify correct path to patch for debug infos --- src/tools/qtlibspatcher/qtlibspatchermain.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 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 #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", -- cgit v1.2.1