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
cb7e9248
Commit
cb7e9248
authored
Sep 24, 2010
by
Thomas Hartmann
Browse files
QmlDesigner: remove annoying warnings
parent
69736d78
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
View file @
cb7e9248
...
...
@@ -205,6 +205,8 @@ void StatesEditorView::modelAttached(Model *model)
insertModelState
(
i
,
state
);
}
for
(
int
i
=
0
;
i
<
m_modelStates
.
count
();
++
i
)
m_editorModel
->
updateState
(
i
);
//refres all states
}
void
StatesEditorView
::
modelAboutToBeDetached
(
Model
*
model
)
...
...
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
View file @
cb7e9248
...
...
@@ -190,7 +190,7 @@ NodeInstance NodeInstance::create(NodeInstanceView *nodeInstanceView, const Mode
instance
.
setId
(
node
.
id
());
QObject
::
connect
(
instance
.
internalObject
(),
SIGNAL
(
destroyed
(
QObject
*
)),
nodeInstanceView
,
SLOT
(
removeIdFromContext
(
QObject
*
)));
//
QObject::connect(instance.internalObject(), SIGNAL(destroyed(QObject*)), nodeInstanceView, SLOT(removeIdFromContext(QObject*)));
foreach
(
const
VariantProperty
&
property
,
node
.
variantProperties
())
{
if
(
property
.
isDynamic
())
...
...
src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
View file @
cb7e9248
...
...
@@ -88,6 +88,7 @@ public:
public
slots
:
void
parseDirectory
(
const
QString
&
canonicalDirPath
,
bool
addToLibrary
=
true
,
const
QString
&
qualification
=
QString
());
void
parseFile
(
const
QString
&
canonicalFilePath
,
bool
addToLibrary
,
const
QString
&
);
void
parseFile
(
const
QString
&
canonicalFilePath
);
public:
QList
<
QFileInfo
>
watchedFiles
(
const
QString
&
canonicalDirPath
);
...
...
@@ -294,6 +295,11 @@ void SubComponentManagerPrivate::parseFile(const QString &canonicalFilePath, boo
}
}
void
SubComponentManagerPrivate
::
parseFile
(
const
QString
&
canonicalFilePath
)
{
parseFile
(
canonicalFilePath
,
true
,
QString
());
}
// dirInfo must already contain a canonical path
QList
<
QFileInfo
>
SubComponentManagerPrivate
::
watchedFiles
(
const
QString
&
canonicalDirPath
)
{
...
...
@@ -369,9 +375,6 @@ void SubComponentManagerPrivate::registerQmlFile(const QFileInfo &fileInfo, cons
if
(
dynamicProperty
.
isDefaultProperty
())
nodeInfo
.
setDefaultProperty
(
dynamicProperty
.
propertyName
());
if
(
dynamicProperty
.
isAlias
())
qDebug
()
<<
dynamicProperty
.
propertyName
();
PropertyMetaInfo
propertyMetaInfo
;
propertyMetaInfo
.
setName
(
dynamicProperty
.
propertyName
());
propertyMetaInfo
.
setType
(
dynamicProperty
.
propertyTypeName
());
...
...
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View file @
cb7e9248
...
...
@@ -554,6 +554,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
{
// Have the QML engine check if the document is valid:
QDeclarativeEngine
engine
;
engine
.
setOutputWarningsToStandardError
(
false
);
foreach
(
const
QString
&
importPath
,
importPaths
)
engine
.
addImportPath
(
importPath
);
QDeclarativeComponent
comp
(
&
engine
);
...
...
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