Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
6e388a39
Commit
6e388a39
authored
May 26, 2010
by
Thomas Hartmann
Browse files
QmlDesigner.autoTests: compilefix
Reviewed-by: Kai Koehne
parent
3d01b6af
Changes
3
Hide whitespace changes
Inline
Side-by-side
tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
View file @
6e388a39
...
...
@@ -2,7 +2,7 @@ include(../../../../../src/plugins/qmldesigner/config.pri)
QT
+=
testlib
DESTDIR
=
$$
DESIGNER_BINARY_DIRECTORY
include
(..
/../../../../
src
/
plugins
/
qmldesigner
/
core
/
core
.
pri
)
include
(..
/../../../../
src
/
plugins
/
qmldesigner
/
designercore
/
designer
core
.
pri
)
include
(..
/../../../../
src
/
libs
/
qmljs
/
qmljs
-
lib
.
pri
)
HEADERS
+=../../../../../
src
/
libs
/
utils
/
changeset
.
h
SOURCES
+=../../../../../
src
/
libs
/
utils
/
changeset
.
cpp
...
...
tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
View file @
6e388a39
...
...
@@ -5,7 +5,7 @@ QT += testlib \
script
\
declarative
DESTDIR
=
$$
DESIGNER_BINARY_DIRECTORY
include
(..
/../../../../
src
/
plugins
/
qmldesigner
/
core
/
core
.
pri
)
include
(..
/../../../../
src
/
plugins
/
qmldesigner
/
designercore
/
designer
core
.
pri
)
include
(..
/../../../../
src
/
libs
/
qmljs
/
qmljs
-
lib
.
pri
)
HEADERS
+=../../../../../
src
/
libs
/
utils
/
changeset
.
h
SOURCES
+=../../../../../
src
/
libs
/
utils
/
changeset
.
cpp
...
...
tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp
View file @
6e388a39
...
...
@@ -40,6 +40,7 @@
#include
<bytearraymodifier.h>
#include
<invalididexception.h>
#include
<invalidmodelnodeexception.h>
#include
<nodeproperty.h>
#include
<propertyeditor.h>
#include
<QDebug>
#include
<QDir>
...
...
@@ -51,6 +52,7 @@
using
namespace
QmlDesigner
;
#include
<cstdio>
#include
"../common/statichelpers.cpp"
...
...
@@ -173,7 +175,9 @@ TestPropertyEditor::TestPropertyEditor()
void
TestPropertyEditor
::
initTestCase
()
{
#ifndef QDEBUG_IN_TESTS
qInstallMsgHandler
(
testMessageOutput
);
#endif
Exception
::
setShouldAssert
(
false
);
}
...
...
@@ -197,7 +201,7 @@ void TestPropertyEditor::createCoreModel()
int
numberOfProperties
=
view
->
rootModelNode
().
propertyNames
().
count
();
selectThrough
(
view
->
rootModelNode
());
QCOMPARE
(
view
->
rootModelNode
().
propertyNames
().
count
(),
numberOfProperties
);
}
catch
(
Exception
&
exception
)
{
}
catch
(
Exception
&
)
{
QFAIL
(
"Exception thrown"
);
}
}
...
...
@@ -307,7 +311,7 @@ void TestPropertyEditor::createRect()
QCOMPARE
(
childNode
.
propertyNames
().
count
(),
4
);
QCOMPARE
(
childNode
.
variantProperty
(
"scale"
).
value
(),
QVariant
());
}
catch
(
Exception
&
exception
)
{
}
catch
(
Exception
&
)
{
QFAIL
(
"Exception thrown"
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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