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
Marco Bubke
flatpak-qt-creator
Commits
9095f77d
Commit
9095f77d
authored
Apr 01, 2010
by
Kai Koehne
Browse files
Place tst_qmldesigner_core in local directory (again)
Also unify path handling somewhat
parent
91667794
Changes
2
Hide whitespace changes
Inline
Side-by-side
tests/auto/qml/qmldesigner/coretests/coretests.pro
View file @
9095f77d
include
(..
/../../../../
src
/
plugins
/
qmldesigner
/
config
.
pri
)
CREATORDIR
=
$$
PWD
/../../../../..
include
(
$$
CREATORDIR
/
src
/
plugins
/
qmldesigner
/
config
.
pri
)
QT
+=
testlib
\
script
\
declarative
include
(..
/../../../../
src
/
plugins
/
qmldesigner
/
core
/
core
.
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
QTCREATOR_TEST
DESTDIR
=
..
/../../../../
bin
include
(
$$
CREATORDIR
/
src
/
plugins
/
qmldesigner
/
core
/
core
.
pri
)
include
(
$$
CREATORDIR
/
src
/
libs
/
qmljs
/
qmljs
-
lib
.
pri
)
HEADERS
+=
$$
CREATORDIR
/
src
/
libs
/
utils
/
changeset
.
h
SOURCES
+=
$$
CREATORDIR
/
src
/
libs
/
utils
/
changeset
.
cpp
DEFINES
+=
MANUALTEST_PATH
=
\\\
"$$PWD"
/../../../../
manual
/
qml
/
testfiles
/
"\\\"
INCLUDEPATH
+=
$$
CREATORDIR
/
src
/
libs
DEFINES
+=
QTCREATOR_UTILS_STATIC_LIB
QML_BUILD_STATIC_LIB
QTCREATOR_TEST
DEFINES
+=
QTCREATORDIR
=
\\\
"$$CREATORDIR\\\"
DEPENDPATH
+=
..
DEPENDPATH
+=
..
/../../../..
/
src
/
plugins
/
qmldesigner
/
core
/
include
DEPENDPATH
+=
$$
CREATORDIR
/
src
/
plugins
/
qmldesigner
/
core
/
include
TARGET
=
tst_qmldesigner_core
CONFIG
+=
console
CONFIG
-=
app_bundle
TEMPLATE
=
app
...
...
tests/auto/qml/qmldesigner/coretests/testcore.cpp
View file @
9095f77d
...
...
@@ -94,7 +94,20 @@ void TestCore::initTestCase()
#endif
Exception
::
setShouldAssert
(
false
);
initializeMetaTypeSystem
(
QLatin1String
(
"../../../../../share/qtcreator"
));
initializeMetaTypeSystem
(
QLatin1String
(
QTCREATORDIR
"/share/qtcreator"
));
// Load plugins
#ifdef Q_OS_MAC
const
QString
pluginPath
=
QTCREATORDIR
"/PlugIns/QmlDesigner"
;
#else
const
QString
pluginPath
=
QTCREATORDIR
"/lib/qmldesigner"
;
#endif
qDebug
()
<<
pluginPath
;
Q_ASSERT
(
QFileInfo
(
pluginPath
).
exists
());
MetaInfo
::
setPluginPaths
(
QStringList
()
<<
pluginPath
);
}
void
TestCore
::
cleanupTestCase
()
...
...
@@ -525,7 +538,7 @@ void TestCore::testRewriterDynamicProperties()
void
TestCore
::
loadSubItems
()
{
QFile
file
(
Q
CoreApplication
::
applicationDirPath
()
+
"/..
/data/fx/topitem.qml"
);
QFile
file
(
Q
String
(
QTCREATORDIR
)
+
"/tests/auto/qml/qmldesigner
/data/fx/topitem.qml"
);
QVERIFY
(
file
.
open
(
QIODevice
::
ReadOnly
|
QIODevice
::
Text
));
QPlainTextEdit
textEdit1
;
...
...
@@ -3220,15 +3233,6 @@ void TestCore::testMetaInfoEnums()
void
TestCore
::
testMetaInfoDotProperties
()
{
#ifdef Q_OS_MAC
const
QString
pluginPath
=
QCoreApplication
::
applicationDirPath
()
+
"/../PlugIns/QmlDesigner"
;
#else
const
QString
pluginPath
=
QCoreApplication
::
applicationDirPath
()
+
"/../"
+
QLatin1String
(
"lib"
)
+
"/qmldesigner"
;
#endif
MetaInfo
::
setPluginPaths
(
QStringList
()
<<
pluginPath
);
QScopedPointer
<
Model
>
model
(
Model
::
create
(
"Qt/Text"
));
QVERIFY
(
model
.
data
());
...
...
@@ -6249,8 +6253,10 @@ void TestCore::loadWelcomeScreen()
void
TestCore
::
loadTestFiles
()
{
const
QString
manualTestPath
=
QLatin1String
(
QTCREATORDIR
)
+
"/tests/manual/qml/testfiles"
;
qDebug
()
<<
manualTestPath
;
{
//empty.qml
QFile
file
(
QString
(
MANUALTEST_PATH
)
+
"/empty.qml"
);
QFile
file
(
manualTestPath
+
"/empty.qml"
);
QVERIFY
(
file
.
open
(
QIODevice
::
ReadOnly
|
QIODevice
::
Text
));
QPlainTextEdit
textEdit
;
...
...
@@ -6273,7 +6279,7 @@ void TestCore::loadTestFiles()
}
{
//helloworld.qml
QFile
file
(
QString
(
MANUALTEST_PATH
)
+
"/helloworld.qml"
);
QFile
file
(
manualTestPath
+
"/helloworld.qml"
);
QVERIFY
(
file
.
open
(
QIODevice
::
ReadOnly
|
QIODevice
::
Text
));
QPlainTextEdit
textEdit
;
...
...
@@ -6303,7 +6309,7 @@ void TestCore::loadTestFiles()
QCOMPARE
(
textNode
.
variantProperty
(
"y"
).
value
().
toInt
(),
93
);
}
{
//states.qml
QFile
file
(
QString
(
MANUALTEST_PATH
)
+
"/states.qml"
);
QFile
file
(
manualTestPath
+
"/states.qml"
);
QVERIFY
(
file
.
open
(
QIODevice
::
ReadOnly
|
QIODevice
::
Text
));
QPlainTextEdit
textEdit
;
...
...
@@ -6352,7 +6358,7 @@ void TestCore::loadTestFiles()
QSKIP
(
"See BAUHAUS-539 (component loading is broken)"
,
SkipAll
);
{
//usingbutton.qml
QFile
file
(
QString
(
MANUALTEST_PATH
)
+
"/usingbutton.qml"
);
QFile
file
(
manualTestPath
+
"/usingbutton.qml"
);
QVERIFY
(
file
.
open
(
QIODevice
::
ReadOnly
|
QIODevice
::
Text
));
QPlainTextEdit
textEdit
;
...
...
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