From 54c8a2e5b5ecf60ac806d2b0b522dc647530bbbd Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Wed, 20 Oct 2010 14:16:04 +1000
Subject: [PATCH] Tests: Get autotests compiling again.
---
tests/auto/cplusplus/codegen/codegen.pro | 3 ++-
tests/auto/cplusplus/codegen/tst_codegen.cpp | 25 +++++++++++++------
.../auto/cplusplus/findusages/findusages.pro | 1 -
tests/auto/cplusplus/lookup/lookup.pro | 1 -
tests/auto/cplusplus/semantic/semantic.pro | 2 --
tests/auto/cplusplus/shared/shared.pri | 4 +--
.../typeprettyprinter/typeprettyprinter.pro | 1 -
tests/auto/fakevim/fakevim.pro | 20 +++++----------
.../highlighterengine/syntaxhighlighter.h | 2 +-
.../qml/qmldesigner/coretests/coretests.pro | 3 ++-
10 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/tests/auto/cplusplus/codegen/codegen.pro b/tests/auto/cplusplus/codegen/codegen.pro
index fa736489c72..e4a3e13167c 100644
--- a/tests/auto/cplusplus/codegen/codegen.pro
+++ b/tests/auto/cplusplus/codegen/codegen.pro
@@ -3,5 +3,6 @@ CONFIG += qt warn_on console depend_includepath
CONFIG += qtestlib testcase
CONFIG -= app_bundle
include(../shared/shared.pri)
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins
SOURCES += tst_codegen.cpp
-TARGET=tst_$$TARGET
+
diff --git a/tests/auto/cplusplus/codegen/tst_codegen.cpp b/tests/auto/cplusplus/codegen/tst_codegen.cpp
index 336cf780624..43cbbb6ffbe 100644
--- a/tests/auto/cplusplus/codegen/tst_codegen.cpp
+++ b/tests/auto/cplusplus/codegen/tst_codegen.cpp
@@ -2,12 +2,13 @@
#include <Control.h>
#include <CppDocument.h>
#include <DiagnosticClient.h>
-#include <InsertionPointLocator.h>
#include <Scope.h>
#include <TranslationUnit.h>
#include <Literals.h>
#include <Bind.h>
#include <Symbols.h>
+#include <cpptools/insertionpointlocator.h>
+#include <cpptools/cpprefactoringchanges.h>
#include <QtTest>
#include <QtDebug>
@@ -20,6 +21,7 @@
tests the InsertionPointLocator.
*/
using namespace CPlusPlus;
+using namespace CppTools;
class tst_Codegen: public QObject
{
@@ -61,7 +63,8 @@ void tst_Codegen::public_in_empty_class()
Snapshot snapshot;
snapshot.insert(doc);
- InsertionPointLocator find(snapshot);
+ CppRefactoringChanges changes(snapshot);
+ InsertionPointLocator find(&changes);
InsertionLocation loc = find.methodDeclarationInClass(
doc->fileName(),
foo,
@@ -100,7 +103,8 @@ void tst_Codegen::public_in_nonempty_class()
Snapshot snapshot;
snapshot.insert(doc);
- InsertionPointLocator find(snapshot);
+ CppRefactoringChanges changes(snapshot);
+ InsertionPointLocator find(&changes);
InsertionLocation loc = find.methodDeclarationInClass(
doc->fileName(),
foo,
@@ -139,7 +143,8 @@ void tst_Codegen::public_before_protected()
Snapshot snapshot;
snapshot.insert(doc);
- InsertionPointLocator find(snapshot);
+ CppRefactoringChanges changes(snapshot);
+ InsertionPointLocator find(&changes);
InsertionLocation loc = find.methodDeclarationInClass(
doc->fileName(),
foo,
@@ -179,7 +184,8 @@ void tst_Codegen::private_after_protected()
Snapshot snapshot;
snapshot.insert(doc);
- InsertionPointLocator find(snapshot);
+ CppRefactoringChanges changes(snapshot);
+ InsertionPointLocator find(&changes);
InsertionLocation loc = find.methodDeclarationInClass(
doc->fileName(),
foo,
@@ -219,7 +225,8 @@ void tst_Codegen::protected_in_nonempty_class()
Snapshot snapshot;
snapshot.insert(doc);
- InsertionPointLocator find(snapshot);
+ CppRefactoringChanges changes(snapshot);
+ InsertionPointLocator find(&changes);
InsertionLocation loc = find.methodDeclarationInClass(
doc->fileName(),
foo,
@@ -259,7 +266,8 @@ void tst_Codegen::protected_betwee_public_and_private()
Snapshot snapshot;
snapshot.insert(doc);
- InsertionPointLocator find(snapshot);
+ CppRefactoringChanges changes(snapshot);
+ InsertionPointLocator find(&changes);
InsertionLocation loc = find.methodDeclarationInClass(
doc->fileName(),
foo,
@@ -319,7 +327,8 @@ void tst_Codegen::qtdesigner_integration()
Snapshot snapshot;
snapshot.insert(doc);
- InsertionPointLocator find(snapshot);
+ CppRefactoringChanges changes(snapshot);
+ InsertionPointLocator find(&changes);
InsertionLocation loc = find.methodDeclarationInClass(
doc->fileName(),
foo,
diff --git a/tests/auto/cplusplus/findusages/findusages.pro b/tests/auto/cplusplus/findusages/findusages.pro
index c6176617884..f3f280a3e07 100644
--- a/tests/auto/cplusplus/findusages/findusages.pro
+++ b/tests/auto/cplusplus/findusages/findusages.pro
@@ -3,4 +3,3 @@ CONFIG += qt warn_on console depend_includepath
CONFIG += qtestlib testcase
include(../shared/shared.pri)
SOURCES += tst_findusages.cpp
-TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/lookup/lookup.pro b/tests/auto/cplusplus/lookup/lookup.pro
index 60aadad47e6..aed1edd2e29 100644
--- a/tests/auto/cplusplus/lookup/lookup.pro
+++ b/tests/auto/cplusplus/lookup/lookup.pro
@@ -3,4 +3,3 @@ CONFIG += qt warn_on console depend_includepath
CONFIG += qtestlib testcase
include(../shared/shared.pri)
SOURCES += tst_lookup.cpp
-TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/semantic/semantic.pro b/tests/auto/cplusplus/semantic/semantic.pro
index 23a18cf37b9..84f613d5ab4 100644
--- a/tests/auto/cplusplus/semantic/semantic.pro
+++ b/tests/auto/cplusplus/semantic/semantic.pro
@@ -2,6 +2,4 @@ TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
CONFIG += qtestlib testcase
include(../shared/shared.pri)
-
SOURCES += tst_semantic.cpp
-TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index f662f2cb555..c1542e68dd5 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -2,5 +2,5 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
include(../../../../qtcreator.pri)
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
-include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus-lib.pri)
-include($$IDE_SOURCE_TREE/src/libs/utils/utils-lib.pri)
+include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
+LIBS += -L$$IDE_PLUGIN_PATH/Nokia
diff --git a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
index 2e884365c1f..e28e54e991a 100644
--- a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
+++ b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
@@ -3,4 +3,3 @@ CONFIG += qt warn_on console depend_includepath
CONFIG += qtestlib testcase
include(../shared/shared.pri)
SOURCES += tst_typeprettyprinter.cpp
-TARGET=tst_$$TARGET
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index 616fba90fc7..012f472d4a4 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -9,22 +9,14 @@ FAKEVIMDIR = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs
SOURCES += \
- $$FAKEVIMDIR/fakevimhandler.cpp \
- $$FAKEVIMDIR/fakevimactions.cpp \
- $$FAKEVIMDIR/fakevimsyntax.cpp \
- $$UTILSDIR/utils/environment.cpp \
- $$UTILSDIR/utils/savedaction.cpp \
- $$UTILSDIR/utils/pathchooser.cpp \
- $$UTILSDIR/utils/basevalidatinglineedit.cpp \
+ $$FAKEVIMDIR/fakevimhandler.cpp \
+ $$FAKEVIMDIR/fakevimactions.cpp \
+ $$FAKEVIMDIR/fakevimsyntax.cpp \
tst_fakevim.cpp
HEADERS += \
- $$FAKEVIMDIR/fakevimhandler.h \
- $$FAKEVIMDIR/fakevimactions.h \
- $$FAKEVIMDIR/fakevimsyntax.h \
- $$UTILSDIR/utils/environment.h \
- $$UTILSDIR/utils/savedaction.h \
- $$UTILSDIR/utils/pathchooser.h \
- $$UTILSDIR/utils/basevalidatinglineedit.h \
+ $$FAKEVIMDIR/fakevimhandler.h \
+ $$FAKEVIMDIR/fakevimactions.h \
+ $$FAKEVIMDIR/fakevimsyntax.h \
INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
diff --git a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h
index d8ce7728705..926cb67be7a 100644
--- a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h
+++ b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h
@@ -45,7 +45,7 @@ public:
virtual ~SyntaxHighlighter() {}
protected:
- void SyntaxHighlighter::applyFormatToSpaces(const QString &, const QTextCharFormat &)
+ void applyFormatToSpaces(const QString &, const QTextCharFormat &)
{}
};
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index 0b323b24baa..2352c5200c6 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -3,7 +3,8 @@ include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
QT += script \
network \
- declarative
+ declarative \
+ webkit
CONFIG += qtestlib testcase
--
GitLab