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
43923748
Commit
43923748
authored
Feb 18, 2010
by
Kai Koehne
Browse files
Let Bauhaus testcore compile again
Also fixing bunch of failures, still some to go though ...
parent
bd82c8f0
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/core/core.pri
View file @
43923748
...
...
@@ -74,7 +74,6 @@ SOURCES += $$PWD/model/abstractview.cpp \
$$PWD/model/modeltotextmerger.cpp \
$$PWD/model/texttomodelmerger.cpp \
$$PWD/model/plaintexteditmodifier.cpp \
$$PWD/model/basetexteditmodifier.cpp \
$$PWD/model/componenttextmodifier.cpp \
$$PWD/model/textmodifier.cpp \
$$PWD/model/qmlmodelview.cpp \
...
...
@@ -96,6 +95,7 @@ SOURCES += $$PWD/model/abstractview.cpp \
$$PWD/instances/nodeinstancemetaobject.cpp \
$$PWD/instances/behaviornodeinstance.cpp \
$$PWD/instances/nodeinstancesignalspy.cpp
HEADERS += $$PWD/include/corelib_global.h \
$$PWD/include/abstractview.h \
$$PWD/include/nodeinstanceview.h \
...
...
@@ -188,6 +188,14 @@ HEADERS += $$PWD/include/corelib_global.h \
$$PWD/instances/nodeinstancemetaobject.h \
$$PWD/instances/behaviornodeinstance.h \
$$PWD/instances/nodeinstancesignalspy.h
contains(CONFIG, plugin) {
# If core.pri has been included in the qmldesigner plugin
SOURCES += $$PWD/model/basetexteditmodifier.cpp
HEADERS += $$PWD/include/basetexteditmodifier.h
}
DISTFILES += $$PWD/metafile/widget.metafile
RESOURCES += $$PWD/core.qrc
OTHER_FILES += $$PWD/metainfo/gui.metainfo
tests/auto/qml/qmldesigner/common/statichelpers.cpp
View file @
43923748
...
...
@@ -27,18 +27,6 @@
**
**************************************************************************/
static
QStringList
pluginPaths
()
{
QStringList
result
;
#ifdef Q_OS_MAC
result
+=
QCoreApplication
::
applicationDirPath
()
+
"/Bauhaus.app/Contents/PlugIns/Bauhaus/ItemLibs"
;
#else // Q_OS_MAC
result
+=
QCoreApplication
::
applicationDirPath
()
+
"/../lib/itemlibs"
;
#endif // Q_OS_MAC
return
result
;
}
static
void
testMessageOutput
(
QtMsgType
type
,
const
char
*
msg
)
{
switch
(
type
)
{
...
...
tests/auto/qml/qmldesigner/coretests/testcore.cpp
View file @
43923748
This diff is collapsed.
Click to expand it.
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