diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-05 17:58:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-05 18:02:18 +0100 |
| commit | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (patch) | |
| tree | c58ac922346363c265ad6873cefe9ed205d84a1d /src/tools | |
| parent | cd542a82b0c2d5c9a4ea167a84e5ea8a25c5d969 (diff) | |
| parent | ea0e868c4881944207e9b3a77011e05a505ff3b7 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/corelib/global/minimum-linux.S
src/network/access/qhttpthreaddelegate.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Id2e817e85f85c68f5482c9a12912d35590f9d5f8
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/uic/cpp/cppwritedeclaration.cpp | 1 | ||||
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp index ba2c75ad66..9e774ad07b 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.cpp +++ b/src/tools/uic/cpp/cppwritedeclaration.cpp @@ -71,7 +71,6 @@ void WriteDeclaration::acceptUI(DomUI *node) QString className = qualifiedClassName; m_driver->findOrInsertWidget(node->elementWidget()); - QString widgetClassName = node->elementWidget()->attributeClass(); QString exportMacro = node->elementExportMacro(); if (!exportMacro.isEmpty()) diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index f2cdf4393a..86908147d8 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -1265,7 +1265,7 @@ void WriteInitialization::writeProperties(const QString &varName, if (stdset) { setFunction = QLatin1String("->set") - + propertyName.left(1).toUpper() + + propertyName.at(0).toUpper() + propertyName.midRef(1) + QLatin1Char('('); } else { |