diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-08 09:25:25 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-08 10:19:22 +0200 |
commit | 07071a23c3bc3f0444068383a57fbc9d50601240 (patch) | |
tree | 26521fdc98b501d8d7e5139927999b747a144e79 /src/tools/uic/cpp/cppwriteinitialization.h | |
parent | f48aa008e992429647968a29ef30d412f1ae379a (diff) |
uic/Python: Fix tab stop/Z-Order and buddy handling
The code compared the attribute names of the properties against the
m_registeredWidgets hash which contained the qualified names
(self.widget) and thus reported errors without actually generating
anything.
Replace the m_registeredWidgets hash by a lookup of the attribute name
in the m_widgets hash and add a function widgetVariableName()
returning the qualified variable name for an attribute name and use
that for the checks.
Remove unused m_registeredActions hash and rename some variables to
make it clearer.
Task-number: PYSIDE-797
Change-Id: Id31d95c1141d21c51eb85bcd8f8fc63486eb36a5
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.h')
-rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index b90ffe00a7..0ee001469c 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -248,8 +248,8 @@ private: struct Buddy { - QString objName; - QString buddy; + QString labelVarName; + QString buddyAttributeName; }; friend class QTypeInfo<Buddy>; @@ -259,8 +259,6 @@ private: QVector<Buddy> m_buddies; QSet<QString> m_buttonGroups; - QHash<QString, DomWidget*> m_registeredWidgets; - QHash<QString, DomAction*> m_registeredActions; typedef QHash<uint, QString> ColorBrushHash; ColorBrushHash m_colorBrushHash; // Map from font properties to font variable name for reuse |