Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Qt CAN - Virtual test-bench tooling
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
5
Issues
5
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Qt CAN 2.0
Qt CAN - Virtual test-bench tooling
Commits
7baf735f
Commit
7baf735f
authored
Jun 26, 2017
by
Thomas BOUTROUE
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build issue on Qt < 5.8
parent
073678e8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
SharedObject.cpp
SharedObject.cpp
+2
-3
No files found.
SharedObject.cpp
View file @
7baf735f
...
...
@@ -84,7 +84,7 @@ void SharedObject::registerQmlTypes (QQmlEngine * qmlEngine) {
// singletons
Help
::
registerQmlModule
(
uri
,
maj
,
min
,
"Help"
);
qmlRegisterSingletonType
(
QUrl
(
"qrc:///components/Components.qml"
),
uri
,
maj
,
min
,
"Components"
);
qmlRegisterSingletonType
<
SharedObject
>
(
uri
,
maj
,
min
,
"Shared"
,
&
SharedObject
::
qmlSingletonProvider
);
qmlRegisterSingletonType
<
SharedObject
>
(
uri
,
maj
,
min
,
"Shared"
,
&
SharedObject
::
qmlSingletonProvider
);
// deprecated types
qmlRegisterTypeNotAvailable
(
uri
,
maj
,
min
,
"NodesList"
,
"Type removed, put nodes anywhere in Network !"
);
qmlRegisterTypeNotAvailable
(
uri
,
maj
,
min
,
"SensorsList"
,
"Type removed, put sensors anywhere in Network !"
);
...
...
@@ -111,6 +111,7 @@ void SharedObject::registerQmlTypes (QQmlEngine * qmlEngine) {
qmlRegisterUncreatableType
<
CanOpenObjDict
>
(
uri
,
maj
,
min
,
"CanOpenObjDict"
,
msg
);
qmlRegisterUncreatableType
<
CanOpenProtocolManager
>
(
uri
,
maj
,
min
,
"CanOpenProtocolManager"
,
msg
);
qmlRegisterUncreatableType
<
ByteArrayWrapper
>
(
uri
,
maj
,
min
,
"ByteArrayWrapper"
,
msg
);
qmlRegisterUncreatableType
<
AbstractObjectListModel
>
(
uri
,
maj
,
min
,
"ObjectRefListModel"
,
msg
);
#if QT_VERSION >= 0x050800 // bug fixed from Qt 5.8.0 (ability to use uncreatable type in QML properties)
// should not be instanciated
qmlRegisterUncreatableType
<
HelpSection
>
(
uri
,
maj
,
min
,
"HelpSection"
,
msg
);
...
...
@@ -134,7 +135,6 @@ void SharedObject::registerQmlTypes (QQmlEngine * qmlEngine) {
qmlRegisterUncreatableType
<
AbstractLink
>
(
uri
,
maj
,
min
,
"AbstractLink"
,
msg
);
qmlRegisterUncreatableType
<
BasicObject
>
(
uri
,
maj
,
min
,
"BasicObject"
,
msg
);
qmlRegisterUncreatableType
<
Memory
>
(
uri
,
maj
,
min
,
"Memory"
,
msg
);
qmlRegisterUncreatableType
<
AbstractObjectListModel
>
(
uri
,
maj
,
min
,
"ObjectRefListModel"
,
msg
);
qmlRegisterUncreatableType
<
PhysicalWorld
>
(
uri
,
maj
,
min
,
"PhysicalWorld"
,
msg
);
#else
// should not be instanciated but due to QML engine bug, must be declared as "creatable" for properties
...
...
@@ -159,7 +159,6 @@ void SharedObject::registerQmlTypes (QQmlEngine * qmlEngine) {
qmlRegisterType
<
AbstractLink
>
(
uri
,
maj
,
min
,
"AbstractLink"
);
qmlRegisterType
<
BasicObject
>
(
uri
,
maj
,
min
,
"BasicObject"
);
qmlRegisterType
<
Memory
>
(
uri
,
maj
,
min
,
"Memory"
);
qmlRegisterType
<
AbstractObjectListModel
>
(
uri
,
maj
,
min
,
"ObjectRefListModel"
);
qmlRegisterType
<
PhysicalWorld
>
(
uri
,
maj
,
min
,
"PhysicalWorld"
);
#endif
// can be created in QML in UI
...
...
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