diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:03:39 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:03:39 +0100 |
| commit | 01b12aabdc40a2d2c3f38fc03dfde9659458491b (patch) | |
| tree | 0279b09360b904f2df67890d04321f53b3bd9995 /src/designer/src/lib/sdk | |
| parent | 0916f2dfd6df25e90d350775ac938749b04007a9 (diff) | |
| parent | 2b6c90317b6bc5f94ca0dc14a3a1467aa8019b17 (diff) | |
| download | qttools-01b12aabdc40a2d2c3f38fc03dfde9659458491b.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I577c86f95e65e7bfae1e92e9fd33356a6301f89b
Diffstat (limited to 'src/designer/src/lib/sdk')
| -rw-r--r-- | src/designer/src/lib/sdk/abstractpromotioninterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp index 90f820330..7443d5cf8 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp @@ -56,7 +56,7 @@ QDesignerPromotionInterface::~QDesignerPromotionInterface() */ /*! - \fn virtual QDesignerPromotionInterface::PromotedClasses promotedClasses() const + \fn QDesignerPromotionInterface::PromotedClasses QDesignerPromotionInterface::promotedClasses() const Returns a list of promoted classes along with their base classes in alphabetical order. It can be used to populate tree models for editing promoted widgets. |