Commit c9710052 authored by Bill King's avatar Bill King

Fix autotests so that they're compiling again.

parent 2ee75bac
......@@ -11,3 +11,4 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = src share
WITH_TESTS:SUBDIRS += tests
INCLUDEPATH += $$PWD/../../shared/cplusplus
DEPENDPATH += $$PWD/../../shared/cplusplus
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
DEPENDPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
LIBS *= -l$$qtLibraryTarget(CPlusPlus)
......@@ -2,8 +2,9 @@ TEMPLATE = lib
TARGET = CppEditor
DEFINES += CPPEDITOR_LIBRARY
include(../../qtcreatorplugin.pri)
include(../../libs/utils/utils.pri)
include(../../shared/indenter/indenter.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/shared/indenter/indenter.pri)
include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
include(cppeditor_dependencies.pri)
HEADERS += cppplugin.h \
cppeditor.h \
......
......@@ -235,7 +235,7 @@ private:
};
#endif
class CppPreprocessor: public CPlusPlus::Client
class CPPTOOLS_EXPORT CppPreprocessor: public CPlusPlus::Client
{
public:
#ifndef ICHECK_BUILD
......
TEMPLATE = lib
TARGET = CppTools
include(../../qtcreatorplugin.pri)
include(../../plugins/locator/locator.pri)
include($$IDE_SOURCE_TREE/src/plugins/locator/locator.pri)
include(cpptools_dependencies.pri)
# DEFINES += QT_NO_CAST_FROM_ASCII
......
include(../../libs/cplusplus/cplusplus.pri)
include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/texteditor/texteditor.pri)
include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri)
include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri)
......@@ -7,7 +7,7 @@ SUBDIRS += \
# profilereader \
aggregation \
changeset \
icheckbuild \
# icheckbuild \
generichighlighter
contains (QT_CONFIG, declarative) {
......
DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
INCLUDEPATH += $$PWD/../../../../src/shared/cplusplus
INCLUDEPATH += $$PWD/../../../../src/libs/cplusplus
DEPENDPATH += $$INCLUDEPATH .
LIBS += -L$$PWD -lCPlusPlusTestSupport
include(../../../../qtcreator.pri)
include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
LIBS += -L$$OUT_PWD
TEMPLATE = lib
TARGET = CPlusPlusTestSupport
CONFIG += static depend_includepath
QT = core gui
DESTDIR = $$PWD
include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri)
include($$PWD/../../../../src/libs/cplusplus/cplusplus.pri)
REL_PATH_TO_SRC = ../../../src
include(../../../qtcreator.pri)
include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
QT += testlib
SOURCES += \
tst_icheckbuild.cpp
DEFINES += ICHECK_BUILD ICHECK_APP_BUILD
INCLUDEPATH += . \
$$REL_PATH_TO_SRC/../ \
$$REL_PATH_TO_SRC/global \
$$REL_PATH_TO_SRC/plugins \
$$REL_PATH_TO_SRC/libs \
$$REL_PATH_TO_SRC/shared/cplusplus \
$$REL_PATH_TO_SRC/libs/cplusplus
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins
LIBS += $$IDE_SOURCE_TREE/lib/qtcreator/plugins
TARGET=tst_$$TARGET
include(./ichecklib.pri)
HEADERS += ./ichecklib.h \
./ichecklib_global.h \
./parsemanager.h
SOURCES += ./ichecklib.cpp \
./parsemanager.cpp
HEADERS += ichecklib.h \
ichecklib_global.h \
parsemanager.h
SOURCES += ichecklib.cpp \
parsemanager.cpp \
tst_icheckbuild.cpp
# ----------------------------------------------------
# This file is generated by the Qt Visual Studio Add-in.
# ------------------------------------------------------
HEADERS += \
$$REL_PATH_TO_SRC/shared/cplusplus/AST.h \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTMatcher.h \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTVisitor.h \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckDeclaration.h \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckDeclarator.h \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckExpression.h \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckName.h \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckSpecifier.h \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckStatement.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Control.h \
$$REL_PATH_TO_SRC/plugins/coreplugin/core_global.h \
$$REL_PATH_TO_SRC/shared/cplusplus/CoreTypes.h \
$$REL_PATH_TO_SRC/shared/cplusplus/CPlusPlusForwardDeclarations.h \
$$REL_PATH_TO_SRC/libs/cplusplus/CppBindings.h \
$$REL_PATH_TO_SRC/libs/cplusplus/CppDocument.h \
$$REL_PATH_TO_SRC/shared/cplusplus/DiagnosticClient.h \
$$REL_PATH_TO_SRC/libs/cplusplus/FastPreprocessor.h \
$$REL_PATH_TO_SRC/shared/cplusplus/FullySpecifiedType.h \
$$REL_PATH_TO_SRC/libs/cplusplus/CheckUndefinedSymbols.h \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTfwd.h \
$$REL_PATH_TO_SRC/libs/cplusplus/LookupContext.h \
$$REL_PATH_TO_SRC/libs/cplusplus/ResolveExpression.h \
$$REL_PATH_TO_SRC/libs/cplusplus/GenTemplateInstance.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Lexer.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Literals.h \
$$REL_PATH_TO_SRC/shared/cplusplus/LiteralTable.h \
$$REL_PATH_TO_SRC/libs/cplusplus/Macro.h \
$$REL_PATH_TO_SRC/shared/cplusplus/MemoryPool.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Name.h \
$$REL_PATH_TO_SRC/libs/cplusplus/NamePrettyPrinter.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Names.h \
$$REL_PATH_TO_SRC/shared/cplusplus/NameVisitor.h \
$$REL_PATH_TO_SRC/shared/cplusplus/ObjectiveCTypeQualifiers.h \
$$REL_PATH_TO_SRC/libs/cplusplus/Overview.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Parser.h \
$$REL_PATH_TO_SRC/libs/cplusplus/pp-cctype.h \
$$REL_PATH_TO_SRC/libs/cplusplus/pp-engine.h \
$$REL_PATH_TO_SRC/libs/cplusplus/pp-macro-expander.h \
$$REL_PATH_TO_SRC/libs/cplusplus/pp-scanner.h \
$$REL_PATH_TO_SRC/libs/cplusplus/pp.h \
$$REL_PATH_TO_SRC/libs/cplusplus/PreprocessorClient.h \
$$REL_PATH_TO_SRC/libs/cplusplus/PreprocessorEnvironment.h \
$$REL_PATH_TO_SRC/libs/utils/qtcassert.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Scope.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Semantic.h \
$$REL_PATH_TO_SRC/shared/cplusplus/SemanticCheck.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Symbol.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Symbols.h \
$$REL_PATH_TO_SRC/shared/cplusplus/SymbolVisitor.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Token.h \
$$REL_PATH_TO_SRC/shared/cplusplus/TranslationUnit.h \
$$REL_PATH_TO_SRC/shared/cplusplus/Type.h \
$$REL_PATH_TO_SRC/shared/cplusplus/TypeMatcher.h \
$$REL_PATH_TO_SRC/libs/cplusplus/TypePrettyPrinter.h \
$$REL_PATH_TO_SRC/shared/cplusplus/TypeVisitor.h \
$$REL_PATH_TO_SRC/plugins/cpptools/cpptools_global.h \
$$REL_PATH_TO_SRC/shared/cplusplus/QtContextKeywords.h
SOURCES += \
$$REL_PATH_TO_SRC/shared/cplusplus/AST.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTMatch0.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTMatcher.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTClone.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTVisit.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTVisitor.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckDeclaration.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckDeclarator.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckExpression.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckName.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckSpecifier.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/CheckStatement.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Control.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/CoreTypes.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/CppBindings.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/CppDocument.cpp \
$$REL_PATH_TO_SRC/plugins/cpptools/cppmodelmanager.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/DiagnosticClient.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/FastPreprocessor.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/FullySpecifiedType.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/CheckUndefinedSymbols.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/LookupContext.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/ResolveExpression.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/GenTemplateInstance.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Keywords.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Lexer.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Literals.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/LiteralTable.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/Macro.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/MemoryPool.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Name.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/NamePrettyPrinter.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Names.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/NameVisitor.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ObjectiveCAtKeywords.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ObjectiveCTypeQualifiers.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/Overview.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Parser.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/pp-engine.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/pp-macro-expander.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/pp-scanner.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/PreprocessorClient.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/PreprocessorEnvironment.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Scope.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Semantic.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/SemanticCheck.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Symbol.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Symbols.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/SymbolVisitor.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Token.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/TranslationUnit.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/Type.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/TypeMatcher.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/TypePrettyPrinter.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/TypeVisitor.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/QtContextKeywords.cpp
......@@ -466,9 +466,9 @@ void ParseManager::getElements(QList<FUNCTIONITEM*> &functionlist
}
}
#if 0
The code for Q_DECLARE_FLAGS was wrong. It's optional, and only does a typedef.
/*The code for Q_DECLARE_FLAGS was wrong. It's optional, and only does a typedef.
That means, if you do the typedef yourself and not use Q_DECLARE_FLAGS, that *is* valid.
Meaning, if one would want to do a check like the ones in this app, one has to check the defined types in the class scope.
Meaning, if one would want to do a check like the ones in this app, one has to check the defined types in the class scope.*/
else {
/****************
Q_DECLARE_FLAGS
......
include(../../../../../src/plugins/qmldesigner/config.pri)
include(../../../../../qtcreator.pri)
#include(../../../../../src/plugins/qmldesigner/config.pri)
QT += testlib
DESTDIR = $$DESIGNER_BINARY_DIRECTORY
include(../../../../../src/plugins/qmldesigner/designercore/designercore.pri)
include(../../../../../src/libs/qmljs/qmljs-lib.pri)
HEADERS+=../../../../../src/libs/utils/changeset.h
SOURCES+=../../../../../src/libs/utils/changeset.cpp
INCLUDEPATH+=../../../../../src/libs
DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
##DEFINES += DONT_MESS_WITH_QDEBUG
DEPENDPATH += ..
DEPENDPATH += ../../../../../src/plugins/qmldesigner/core/include
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
TARGET = tst_bauhaus
CONFIG += console
......
CREATORDIR=$$PWD/../../../../..
include(../../../../../qtcreator.pri)
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
include($$CREATORDIR/src/plugins/qmldesigner/config.pri)
QT += testlib \
script \
declarative
include($$CREATORDIR/src/plugins/qmldesigner/designercore/designercore.pri)
include($$CREATORDIR/src/libs/qmljs/qmljs-lib.pri)
HEADERS+=$$CREATORDIR/src/libs/utils/changeset.h
SOURCES+=$$CREATORDIR/src/libs/utils/changeset.cpp
INCLUDEPATH+=$$CREATORDIR/src/libs
DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB QTCREATOR_TEST
# DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
DEFINES+=QTCREATORDIR=\\\"$$CREATORDIR\\\"
DEFINES+=QT_CREATOR
DEFINES+=QT_CREATOR QTCREATOR_TEST
DEPENDPATH += ..
DEPENDPATH += $$CREATORDIR/src/plugins/qmldesigner/designercore/include
DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri)
TARGET = tst_qmldesigner_core
......
......@@ -27,10 +27,9 @@
**
**************************************************************************/
#include "abstractproperty.h"
#include "nodeproperty.h"
#include "testrewriterview.h"
#include <QObject>
#include <nodeproperty.h>
using namespace QmlDesigner;
using namespace QmlDesigner::Internal;
......
include(../../../../../src/plugins/qmldesigner/config.pri)
include(../../../../../src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri)
include(../../../../../qtcreator.pri)
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
# include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri)
QT += testlib \
script \
declarative
DESTDIR = $$DESIGNER_BINARY_DIRECTORY
include(../../../../../src/plugins/qmldesigner/designercore/designercore.pri)
include(../../../../../src/libs/qmljs/qmljs-lib.pri)
HEADERS+=../../../../../src/libs/utils/changeset.h
SOURCES+=../../../../../src/libs/utils/changeset.cpp
INCLUDEPATH+=../../../../../src/libs
DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
# DESTDIR = $$DESIGNER_BINARY_DIRECTORY
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri)
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
HEADERS+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.h
SOURCES+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.cpp
INCLUDEPATH+=$$IDE_SOURCE_TREE/src/libs
#DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
DEPENDPATH += ../../../../../src/plugins/qmldesigner/core/include
DEPENDPATH += ..
DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
TARGET = tst_propertyeditor
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
......
TEMPLATE = subdirs
SUBDIRS += coretests
SUBDIRS += propertyeditortests
# SUBDIRS += propertyeditortests
SUBDIRS += bauhaustests
......@@ -30,11 +30,6 @@
#include "testview.h"
#include <QtDebug>
#include <modelnode.h>
#include <model.h>
#include <modelnode.h>
#include <nodeabstractproperty.h>
#include <nodelistproperty.h>
#include <qtestcase.h>
TestView::TestView(QObject *parent)
......
......@@ -30,7 +30,6 @@
#ifndef TESTVIEW_H
#define TESTVIEW_H
#include <modelnode.h>
#include <qmlmodelview.h>
#include <QVariant>
#include <QStringList>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment