summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | qml: Use finished signal from tests to kill serverRainer Keller2018-10-041-7/+11
| | | | | | | | | | | | | | Task-number: QTBUG-70618 Change-Id: I564411c426537a5746ed90a7ec9e5281128c2641 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | doc: Add missing row commandRainer Keller2018-10-021-0/+1
| | | | | | | | | | Change-Id: Id6cc200df9f17295033dbf017acc5fb1c30ecee8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | doc: Remove extra columnRainer Keller2018-10-021-1/+0
| | | | | | | | | | Change-Id: Ie569664f7a5d86e4b6f37fea20a051163e9abaa9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qml: QLocalizedText is now used directly without a wrapperv5.12.0-beta1Rainer Keller2018-09-241-10/+2
| | | | | | | | | | Change-Id: Id781325faaf032ffe104ea4ce6d7017a74a8240c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename QOpcUaNode::value() to valueAttribute()Rainer Keller2018-09-212-3/+3
| | | | | | | | | | Change-Id: I85f90a6f7cec2ef3deed8b183c665098f1bab5b0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename publishingEnabled() to isPublishingEnabled()Rainer Keller2018-09-213-3/+3
| | | | | | | | | | | | Change-Id: I26e2bfa12ac883b9f39fd9a43dff7fbe71f28ef7 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename setEnableNamespaceAutoupdate to setNamespaceAutoupdateRainer Keller2018-09-214-9/+9
| | | | | | | | | | | | Change-Id: Icf181564065e8605adc9486293a07adb0c7667bd Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename isForward to isForwardReferenceRainer Keller2018-09-2114-51/+51
| | | | | | | | | | | | | | | | | | Make it more clear what is forward. Change-Id: Icb30d130a12b3188982858823b6a0345625f0522 Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Remove the mask() getter from the QOpcUaNodeCreationAttributes APIJannis Voelker2018-09-214-41/+82
| | | | | | | | | | | | Change-Id: Ie18b70286101e0974f89989c5226f661ca858c20 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Fix Windows compile errorsRainer Keller2018-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes missed occurrence. qopen62541utils.cpp(66): warning C4003: not enough actual parameters for macro 'max' qopen62541utils.cpp(66): error C2589: '(': illegal token on right side of '::' qopen62541utils.cpp(66): error C2059: syntax error: '::' qopen62541utils.cpp(68): error C2181: illegal else without matching if qopen62541utils.cpp(59): fatal error C1903: unable to recover from previous error(s); stopping compilation Change-Id: Ib8b123530e71f066f7f1939e3b776f2beeb58260 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | qml: Fix crash at end of test run on windowsRainer Keller2018-09-201-9/+9
| | | | | | | | | | | | | | | | This change leaks a QProcess. We'll do a proper fix later. Task-number: QTBUG-70618 Change-Id: I7e0ebe58b1c53427514a0b4da5c216d764e35ea0 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Improve filter API of QOpcUaMonitoringParametersJannis Voelker2018-09-179-34/+134
| | | | | | | | | | | | | | | | | | This patch removes the generic setFilter() method and adds setters for the two acceptable types. The filter result is now stored in a separate data member. Change-Id: I0e93a1a30448d00d420d60e5119f09fa46f423d6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename QOpcUa::NodeIds::NS0 to QOpcUa::NodeIds::Namespace0Jannis Voelker2018-09-1712-96/+96
| | | | | | | | | | | | | | | | The abbreviation "ns0" is also removed from the converter functions in qopcuatype.cpp. Change-Id: Ic8e9aed4891f9e550f4e00105182744f1eb9b2e3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Convert QLocalizedText to a gadgetRainer Keller2018-09-178-154/+39
| | | | | | | | | | | | | | | | | | | | | | | | This will not add any overhead to execution but saves a lot of QML hassle because the wrapper that was present before needs to have additional converter functions to allow QML to unwrap LocalizedText to QLocalizedText in case it is returned in a QVariant. This happens for example if a node method called on a server returns such types. Change-Id: I664c417d1bebdc266764d51d564d12d98a4101a9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qml: Expose method node object nodeRainer Keller2018-09-177-52/+60
| | | | | | | | | | | | | | | | | | For easy access to the properties of the function to call the target node is exposed as node object instead of a string. Change-Id: I3e5ed1b0f94576221a5eeaca70cd14dbc765377c Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | tests: Fix wait for 2nd signalRainer Keller2018-09-171-3/+1
| | | | | | | | | | Change-Id: Ifa1afe59a87195d93dfeb5446c3ca9d635e558d3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | tests: Use QCOMPARE where possibleRainer Keller2018-09-171-206/+207
| | | | | | | | | | | | | | Provides valuable information in the log file in case a test fails. Change-Id: I8f785722bcbf7ee7b2e6441516fddd89ed434023 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Clarify the names of the DataChangeFilter::DataChangeTrigger enumJannis Voelker2018-09-173-5/+5
| | | | | | | | | | Change-Id: Iabb22adb0fa1b89953596d07412b67ef9cb2049e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename QOpcUaMonitoringParameters::shared() to subscriptionType()Jannis Voelker2018-09-177-10/+10
| | | | | | | | | | | | | | The name shared() implies a boolean while the value is an enum. Change-Id: If68198038214611f463b8881bb1357a26de0fa36 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-151-0/+18
|\| | | | | | | Change-Id: I1a444cda7bf66de3849d1b837172bc726bf77ec9
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+18
| |\ | | | | | | | | | Change-Id: Ibedc696a2bd461190bda4c6fbb574ea5407595c4
| | * Add changes file for 5.11.2v5.11.25.11.2Jannis Voelker2018-08-301-0/+18
| |/ | | | | | | | | Change-Id: Ib2bf944111b0b7576289b8cb488333c909c59448 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Fix declarative autotests on windowsRainer Keller2018-09-142-4/+8
| | | | | | | | | | | | | | | | On windows the tests are way faster than on linux which leads to timing issues. Change-Id: I5f5744818adfd6503a05d1dfe38c59060bef5ff8 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Fix build on msvc2017 x86Maurice Kalinowski2018-09-141-0/+1
| | | | | | | | | | Change-Id: Ied30665ab02b7212e5e2b482fafad8d2803ad2d2 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | qml: Include server messages in test outputv5.12.0-alpha1Rainer Keller2018-09-131-0/+1
| | | | | | | | | | Change-Id: I0622e7fe4b7a416a5d1411df3be9fd2986ba8cab Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | testserver: Add method with multiple output argumentsRainer Keller2018-09-133-1/+100
| | | | | | | | | | Change-Id: I706bbc80d7a69b15d58ffb5ecdb51a062f3d4a53 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | doc: Describe the returned typesRainer Keller2018-09-131-0/+9
| | | | | | | | | | Change-Id: If951c182371a4a5406274c4dcbbcad91cb387450 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Declare Types enumRainer Keller2018-09-131-0/+1
| | | | | | | | | | Change-Id: I2a4a0df124e0c62efbcc30276b23d8f5e67d3610 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix QML autotestRainer Keller2018-09-131-2/+4
| | | | | | | | | | | | | | On Windows both signals are received at once. Change-Id: I07b6061e69a37c5eba845a253d86839d971088ca Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix Windows compile errorsRainer Keller2018-09-137-38/+38
| | | | | | | | | | | | | | | | | | | | | | qopen62541utils.cpp(66): warning C4003: not enough actual parameters for macro 'max' qopen62541utils.cpp(66): error C2589: '(': illegal token on right side of '::' qopen62541utils.cpp(66): error C2059: syntax error: '::' qopen62541utils.cpp(68): error C2181: illegal else without matching if qopen62541utils.cpp(59): fatal error C1903: unable to recover from previous error(s); stopping compilation Change-Id: Ie60e73c33854ea3922378efdeca47d646ad518ad Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
* | simulationserver: Set proper display namesRainer Keller2018-09-051-13/+13
| | | | | | | | | | Change-Id: I21a228b29245de78dc8638be6c12737690641f57 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Clarify the description of the configuration step output in the docsJannis Voelker2018-09-051-2/+2
| | | | | | | | | | | | Change-Id: I3c31ff20a2512077b07bf67a8c89d9478b238ceb Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Add LIBDIR and INCDIR options to the open62541 plugin build docsJannis Voelker2018-09-041-0/+20
| | | | | | | | | | | | | | Change-Id: I89faaf7591e2df42dbde52c0b52abf5a5f3db4e9 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Properly prepare QtOpcUa QML plugin for future Qt versionsAlex Blasche2018-08-312-12/+22
| | | | | | | | | | | | | | | | In addition the usual loading structure is applied and @uri tag added. Task-number: QTBUG-70264 Change-Id: I90052172e400b704febee811412aabf82f306ded Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | qml: Gather read of attributes in one placeRainer Keller2018-08-304-24/+28
| | | | | | | | | | | | | | | | | | | | Instead of all subclasses reading the attributes on their own a central place in the base class is used. Subclasses can set a custom set of attributes to read in the base class. Change-Id: I2c1249c8f62c9f0a10507bbb8e6dc0c60608a8e0 Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qml: Provide resolved node informationRainer Keller2018-08-302-0/+8
| | | | | | | | | | | | | | | | The method node needs to access information about the object node in a later changeset. Change-Id: I3c999f06ab079c58188eb9ab09ba11167b798ae1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qml: Add basic node propertiesRainer Keller2018-08-309-7/+332
| | | | | | | | | | Change-Id: Ie32c89dd91e1da6e214debe7a01733a8ce127f50 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qml: Add LocalizedText typeRainer Keller2018-08-295-3/+153
| | | | | | | | | | Change-Id: I15502258693fb82865b85cf064c7c6e3a3427853 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix localesRainer Keller2018-08-293-20/+20
| | | | | | | | | | | | | | Conform to OPC UA specification part 3, 8.4 Change-Id: Id0893ee98bbd84fcace67951b51f817717276766 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qml: Introduce node attribute cacheRainer Keller2018-08-289-44/+312
| | | | | | | | | | | | | | | | The QOpcUaNode attributeUpdated signal is emitted even when the actual value has not changed. Change-Id: Ib8e232d03903e7442244eccf4f20b607e8c40d39 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | qml: Fix name clashes in exposed C++ enumsRainer Keller2018-08-242-0/+51
| | | | | | | | | | | | | | | | | | Because of name clashes and the way QML registers enum classes there has to be a class annotation to prevent unscoped enum classes. Change-Id: I8aac3a1291401a99b26c77f55dc5f88eb874da1e Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qml: Add comment that adding further types to the namespace is not neededRainer Keller2018-08-241-0/+2
| | | | | | | | | | | | Change-Id: I0fd7218a2165a64b4cd3dafb9013dbbb097eb53e Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | testserver: Add description for variable nodesRainer Keller2018-08-241-0/+6
| | | | | | | | | | | | Change-Id: I9dd0846b668200305170cfc9e47aff9756422e3a Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix qdoc warningsJannis Voelker2018-08-241-1/+1
| | | | | | | | | | | | | | | | The arguments of QOpcUa::nodeIdEquals were not documented. Change-Id: Iae1cabbbfc653b8b30b1f2303d65666300ae3523 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Use qCInfo in uacppclient.cppJannis Voelker2018-08-201-4/+4
| | | | | | | | | | | | | | qCInfo is now used for all notifications about unimplemented services. Change-Id: Id47f7226b374c0eb590bef1789ba54c259abeab6 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Add node managementJannis Voelker2018-08-1727-2/+2846
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a node management API to Qt OPC UA. The support is open62541 only for now. - addNode() - deleteNode() - addReference() - deleteReference() Change-Id: I60631346a1a4a097ba4555e4bb3cbc93c71efee8 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | qml: Enable namespace autoupdateRainer Keller2018-08-151-0/+1
| | | | | | | | | | Change-Id: Ic06c30e686dc8dc1f94d99db4475bef41677b49e Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Emit attributeUpdated whenever the attribute cache is updatedJannis Voelker2018-08-1413-35/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to handle all reads, writes and data changes with just a single slot. The dataChangeOccurred signal is added to QOpcUaNode and is only emitted after a data change notification has been received. This is a change in behavior compared to 5.11 where the attributeUpdated() signal was only emitted after a data change and three signals were required to fully keep track of changes to the attribute cache. Change-Id: I3d7d33b7b0eb48b044d64178d448bedc4f3a756d Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Namespace autoupdateRainer Keller2018-08-145-5/+114
| | | | | | | | | | | | | | | | | | | | The namespace array node will be watched for changes so that the namespaceArrayUpdated signal will be emitted without calling updateNamespaceArray beforehand. Change-Id: I8bd628cf6794d755065def0e4a0513dc56be6638 Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.11' into dev" into ↵Jannis Völker2018-08-142-2/+13
|\ \ | | | | | | | | | refs/staging/dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 04:21:13 +0000