Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
c9710052
Commit
c9710052
authored
Jul 06, 2010
by
Bill King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix autotests so that they're compiling again.
parent
2ee75bac
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
62 additions
and
196 deletions
+62
-196
qtcreator.pro
qtcreator.pro
+1
-0
src/libs/cplusplus/cplusplus.pri
src/libs/cplusplus/cplusplus.pri
+2
-2
src/plugins/cppeditor/cppeditor.pro
src/plugins/cppeditor/cppeditor.pro
+3
-2
src/plugins/cpptools/cppmodelmanager.h
src/plugins/cpptools/cppmodelmanager.h
+1
-1
src/plugins/cpptools/cpptools.pro
src/plugins/cpptools/cpptools.pro
+1
-1
src/plugins/cpptools/cpptools_dependencies.pri
src/plugins/cpptools/cpptools_dependencies.pri
+3
-3
tests/auto/auto.pro
tests/auto/auto.pro
+1
-1
tests/auto/cplusplus/shared/shared.pri
tests/auto/cplusplus/shared/shared.pri
+4
-4
tests/auto/cplusplus/shared/shared.pro
tests/auto/cplusplus/shared/shared.pro
+1
-3
tests/auto/icheckbuild/icheckbuild.pro
tests/auto/icheckbuild/icheckbuild.pro
+12
-17
tests/auto/icheckbuild/ichecklib.pri
tests/auto/icheckbuild/ichecklib.pri
+0
-119
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.cpp
+2
-2
tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
+3
-10
tests/auto/qml/qmldesigner/coretests/coretests.pro
tests/auto/qml/qmldesigner/coretests/coretests.pro
+12
-12
tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp
tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp
+1
-2
tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
...l/qmldesigner/propertyeditortests/propertyeditortests.pro
+14
-10
tests/auto/qml/qmldesigner/qmldesigner.pro
tests/auto/qml/qmldesigner/qmldesigner.pro
+1
-1
tests/auto/qml/qmldesigner/testview.cpp
tests/auto/qml/qmldesigner/testview.cpp
+0
-5
tests/auto/qml/qmldesigner/testview.h
tests/auto/qml/qmldesigner/testview.h
+0
-1
No files found.
qtcreator.pro
View file @
c9710052
...
...
@@ -11,3 +11,4 @@ TEMPLATE = subdirs
CONFIG
+=
ordered
SUBDIRS
=
src
share
WITH_TESTS
:
SUBDIRS
+=
tests
src/libs/cplusplus/cplusplus.pri
View file @
c9710052
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)
src/plugins/cppeditor/cppeditor.pro
View file @
c9710052
...
...
@@ -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
\
...
...
src/plugins/cpptools/cppmodelmanager.h
View file @
c9710052
...
...
@@ -235,7 +235,7 @@ private:
};
#endif
class
CppPreprocessor
:
public
CPlusPlus
::
Client
class
C
PPTOOLS_EXPORT
C
ppPreprocessor
:
public
CPlusPlus
::
Client
{
public:
#ifndef ICHECK_BUILD
...
...
src/plugins/cpptools/cpptools.pro
View file @
c9710052
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
...
...
src/plugins/cpptools/cpptools_dependencies.pri
View file @
c9710052
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)
tests/auto/auto.pro
View file @
c9710052
...
...
@@ -7,7 +7,7 @@ SUBDIRS += \
#
profilereader
\
aggregation
\
changeset
\
icheckbuild
\
#
icheckbuild
\
generichighlighter
contains
(
QT_CONFIG
,
declarative
)
{
...
...
tests/auto/cplusplus/shared/shared.pri
View file @
c9710052
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
tests/auto/cplusplus/shared/shared.pro
View file @
c9710052
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
)
tests/auto/icheckbuild/icheckbuild.pro
View file @
c9710052
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
tests/auto/icheckbuild/ichecklib.pri
deleted
100644 → 0
View file @
2ee75bac
# ----------------------------------------------------
# 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
tests/auto/icheckbuild/parsemanager.cpp
View file @
c9710052
...
...
@@ -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
...
...
tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
View file @
c9710052
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
/
designer
core
/
include
TARGET
=
tst_bauhaus
CONFIG
+=
console
...
...
tests/auto/qml/qmldesigner/coretests/coretests.pro
View file @
c9710052
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
...
...
tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp
View file @
c9710052
...
...
@@ -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
;
...
...
tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
View file @
c9710052
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
...
...
tests/auto/qml/qmldesigner/qmldesigner.pro
View file @
c9710052
TEMPLATE
=
subdirs
SUBDIRS
+=
coretests
SUBDIRS
+=
propertyeditortests
#
SUBDIRS
+=
propertyeditortests
SUBDIRS
+=
bauhaustests
tests/auto/qml/qmldesigner/testview.cpp
View file @
c9710052
...
...
@@ -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
)
...
...
tests/auto/qml/qmldesigner/testview.h
View file @
c9710052
...
...
@@ -30,7 +30,6 @@
#ifndef TESTVIEW_H
#define TESTVIEW_H
#include <modelnode.h>
#include <qmlmodelview.h>
#include <QVariant>
#include <QStringList>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment