diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-01-07 13:24:12 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-07 13:24:12 +0100 |
| commit | 04a4bacbf91974874b7743d82956842bc4b7cbcd (patch) | |
| tree | 091e27ce8fb601b36b6b82837f281ac70439ca55 /src | |
| parent | 9ee785a4efc0ddbf1edf705de690955a97e0a34b (diff) | |
| parent | bcafe202c9f8a7c4bad4cf60095138b1d6cbf2ac (diff) | |
| download | qt-creator-04a4bacbf91974874b7743d82956842bc4b7cbcd.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/coreplugin/dialogs/externaltoolconfig.ui
Change-Id: Ie38e9028cee599578c59b22325d85c097335243e
Diffstat (limited to 'src')
33 files changed, 1004 insertions, 847 deletions
diff --git a/src/libs/qtcreatorcdbext/pytype.cpp b/src/libs/qtcreatorcdbext/pytype.cpp index ec67771824..b85b518f6b 100644 --- a/src/libs/qtcreatorcdbext/pytype.cpp +++ b/src/libs/qtcreatorcdbext/pytype.cpp @@ -105,9 +105,11 @@ static bool isArrayType(const std::string &typeName) static ULONG extractArraySize(const std::string &typeName, size_t openArrayPos = 0) { if (openArrayPos == 0) - openArrayPos = typeName.find_last_of('['); - const auto closeArrayPos = typeName.find_last_of(']'); - if (openArrayPos == std::string::npos || closeArrayPos == std::string::npos) + openArrayPos = typeName.find_first_of('['); + if (openArrayPos == std::string::npos) + return 0; + const auto closeArrayPos = typeName.find_first_of(']', openArrayPos); + if (closeArrayPos == std::string::npos) return 0; const std::string arraySizeString = typeName.substr(openArrayPos + 1, closeArrayPos - openArrayPos - 1); @@ -327,8 +329,15 @@ std::string PyType::targetName() const const std::string &typeName = name(); if (isPointerType(typeName)) return stripPointerType(typeName); - if (isArrayType(typeName)) - return typeName.substr(0, typeName.find_last_of('[')); + if (isArrayType(typeName)) { + const auto openArrayPos = typeName.find_first_of('['); + if (openArrayPos == std::string::npos) + return typeName; + const auto closeArrayPos = typeName.find_first_of(']', openArrayPos); + if (closeArrayPos == std::string::npos) + return typeName; + return typeName.substr(0, openArrayPos) + typeName.substr(closeArrayPos + 1); + } return typeName; } diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp index 33a779a91d..2be64260e8 100644 --- a/src/libs/utils/fileinprojectfinder.cpp +++ b/src/libs/utils/fileinprojectfinder.cpp @@ -144,7 +144,7 @@ QString FileInProjectFinder::findFile(const QUrl &fileUrl, bool *success) const if (originalPath.isEmpty()) // e.g. qrc:// originalPath = fileUrl.path(); - QString result; + QString result = originalPath; bool found = findFileOrDirectory(originalPath, [&](const QString &fileName, int) { result = fileName; }); diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp index 5864ece3ef..cac25546db 100644 --- a/src/libs/utils/savefile.cpp +++ b/src/libs/utils/savefile.cpp @@ -186,7 +186,8 @@ bool SaveFile::commit() const QString &renameError = m_tempFile->errorString(); m_tempFile->remove(); setErrorString(renameError); - result = false; + QFile::rename(backupName, finalFileName); // rollback to backup if possible ... + return false; // ... or keep the backup copy at least } QFile::remove(backupName); diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 3ad3ac10db..5d7a48754b 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -186,9 +186,10 @@ void AndroidDebugSupport::start() gdbServer.setPort(m_runner->gdbServerPort().number()); setRemoteChannel(gdbServer); + int sdkVersion = qMax(AndroidManager::minimumSDK(target), AndroidManager::minimumNDK(target)); Utils::FileName sysRoot = AndroidConfigurations::currentConfig().ndkLocation() .appendPath("platforms") - .appendPath(QString("android-%1").arg(AndroidManager::minimumSDK(target))) + .appendPath(QString("android-%1").arg(sdkVersion)) .appendPath(toNdkArch(AndroidManager::targetArch(target))); setSysRoot(sysRoot); qCDebug(androidDebugSupportLog) << "Sysroot: " << sysRoot; diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index c76efe83c2..f7fa07a842 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -247,6 +247,13 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit) return minSDKVersion; } +int AndroidManager::minimumNDK(ProjectExplorer::Target *target) +{ + auto qt = static_cast<Android::Internal::AndroidQtVersion *>( + QtSupport::QtKitInformation::qtVersion(target->kit())); + return qt->mininmumNDK(); +} + QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target) { auto androidBuildApkStep diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index e43d48fde3..25ccfa5095 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -89,6 +89,7 @@ public: static int minimumSDK(ProjectExplorer::Target *target); static int minimumSDK(const ProjectExplorer::Kit *kit); + static int minimumNDK(ProjectExplorer::Target *target); static QString targetArch(ProjectExplorer::Target *target); diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index eaf47f6481..a1a6d047ba 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -123,9 +123,25 @@ QString AndroidQtVersion::targetArch() const return m_targetArch; } +int AndroidQtVersion::mininmumNDK() const +{ + ensureMkSpecParsed(); + return m_minNdk; +} + void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const { m_targetArch = evaluator->value(QLatin1String("ANDROID_TARGET_ARCH")); + const QString androidPlatform = evaluator->value(QLatin1String("ANDROID_PLATFORM")); + if (!androidPlatform.isEmpty()) { + const QRegExp regex("android-(\\d+)"); + if (regex.exactMatch(androidPlatform)) { + bool ok = false; + int tmp = regex.cap(1).toInt(&ok); + if (ok) + m_minNdk = tmp; + } + } BaseQtVersion::parseMkSpec(evaluator); } diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h index 62bbd930c6..d009c68ceb 100644 --- a/src/plugins/android/androidqtversion.h +++ b/src/plugins/android/androidqtversion.h @@ -55,10 +55,12 @@ public: QString description() const override; QString targetArch() const; + int mininmumNDK() const; protected: void parseMkSpec(ProFileEvaluator *) const override; private: mutable QString m_targetArch; + mutable int m_minNdk = -1; }; } // namespace Internal diff --git a/src/plugins/autotest/qtest/qttestparser.cpp b/src/plugins/autotest/qtest/qttestparser.cpp index b806e79f8d..234aeca79f 100644 --- a/src/plugins/autotest/qtest/qttestparser.cpp +++ b/src/plugins/autotest/qtest/qttestparser.cpp @@ -107,7 +107,7 @@ static QString testClass(const CppTools::CppModelManager *modelManager, if (!macro.isFunctionLike()) continue; const QByteArray name = macro.macro().name(); - if (QTestUtils::isQTestMacro(name)) { + if (QTestUtils::isQTestMacro(name) && !macro.arguments().isEmpty()) { const CPlusPlus::Document::Block arg = macro.arguments().at(0); return QLatin1String(fileContent.mid(int(arg.bytesBegin()), int(arg.bytesEnd() - arg.bytesBegin()))); diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index 0e33385381..b16b452514 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -237,7 +237,7 @@ void TestResultsPane::addTestResult(const TestResultPtr &result) void TestResultsPane::addOutput(const QByteArray &output) { - m_textOutput->appendPlainText(QString::fromLatin1(TestOutputReader::chopLineBreak(output))); + m_textOutput->appendPlainText(QString::fromUtf8(TestOutputReader::chopLineBreak(output))); } QWidget *TestResultsPane::outputWidget(QWidget *parent) diff --git a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp index 9adc9b2edb..01db2bd56c 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp @@ -63,6 +63,7 @@ CMakeKitConfigWidget::CMakeKitConfigWidget(Kit *kit, m_comboBox(new QComboBox), m_manageButton(new QPushButton(KitConfigWidget::msgManage())) { + m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); m_comboBox->setEnabled(false); m_comboBox->setToolTip(toolTip()); diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index f24060b907..af23aaf688 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -411,6 +411,8 @@ ExternalToolConfig::ExternalToolConfig(QWidget *parent) : m_model(new ExternalToolModel(this)) { ui->setupUi(this); + ui->scrollArea->viewport()->setAutoFillBackground(false); + ui->scrollAreaWidgetContents->setAutoFillBackground(false); ui->toolTree->setModel(m_model); ui->toolTree->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed); diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui index 635ee47f32..a49ae83b89 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui @@ -28,7 +28,7 @@ <bool>false</bool> </attribute> <attribute name="headerDefaultSectionSize"> - <number>0</number> + <number>21</number> </attribute> </widget> </item> @@ -82,222 +82,266 @@ </layout> </item> <item> - <widget class="QWidget" name="infoWidget" native="true"> + <widget class="QScrollArea" name="scrollArea"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>10</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <layout class="QFormLayout" name="formLayout"> - <property name="fieldGrowthPolicy"> - <enum>QFormLayout::ExpandingFieldsGrow</enum> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="lineWidth"> + <number>0</number> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>396</width> + <height>444</height> + </rect> </property> - <item row="0" column="0"> - <widget class="QLabel" name="descriptionLabel"> - <property name="text"> - <string>Description:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="description"/> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="executableLabel"> - <property name="text"> - <string>Executable:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="Utils::PathChooser" name="executable"> - <property name="expectedKind"> - <enum>Utils::PathChooser::Command</enum> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="argumentsLabel"> - <property name="text"> - <string>Arguments:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="arguments"/> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="workingDirectoryLabel"> - <property name="text"> - <string>Working directory:</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="Utils::PathChooser" name="workingDirectory"> - <property name="expectedKind"> - <enum>Utils::PathChooser::Directory</enum> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="outputLabel"> - <property name="toolTip"> - <string><html><head/><body> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QWidget" name="infoWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>10</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QFormLayout" name="formLayout"> + <property name="fieldGrowthPolicy"> + <enum>QFormLayout::ExpandingFieldsGrow</enum> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="descriptionLabel"> + <property name="text"> + <string>Description:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="description"/> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="executableLabel"> + <property name="text"> + <string>Executable:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="Utils::PathChooser" name="executable" native="true"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="argumentsLabel"> + <property name="text"> + <string>Arguments:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="arguments"/> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="workingDirectoryLabel"> + <property name="text"> + <string>Working directory:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="Utils::PathChooser" name="workingDirectory" native="true"/> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="outputLabel"> + <property name="toolTip"> + <string><html><head/><body> <p>What to do with the executable's standard output. <ul><li>Ignore: Do nothing with it.</li><li>Show in pane: Show it in the general output pane.</li><li>Replace selection: Replace the current selection in the current document with it.</li></ul></p></body></html> </string> - </property> - <property name="text"> - <string>Output:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QComboBox" name="outputBehavior"> - <item> - <property name="text"> - <string>Ignore</string> - </property> - </item> - <item> - <property name="text"> - <string>Show in Pane</string> - </property> - </item> - <item> - <property name="text"> - <string>Replace Selection</string> - </property> - </item> - </widget> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="errorOutputLabel"> - <property name="toolTip"> - <string><html><head><body> + </property> + <property name="text"> + <string>Output:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QComboBox" name="outputBehavior"> + <item> + <property name="text"> + <string>Ignore</string> + </property> + </item> + <item> + <property name="text"> + <string>Show in Pane</string> + </property> + </item> + <item> + <property name="text"> + <string>Replace Selection</string> + </property> + </item> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="errorOutputLabel"> + <property name="toolTip"> + <string><html><head><body> <p >What to do with the executable's standard error output.</p> <ul><li>Ignore: Do nothing with it.</li> <li>Show in pane: Show it in the general output pane.</li> <li>Replace selection: Replace the current selection in the current document with it.</li> </ul></body></html></string> - </property> - <property name="text"> - <string>Error output:</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <widget class="QComboBox" name="errorOutputBehavior"> - <item> - <property name="text"> - <string>Ignore</string> - </property> - </item> - <item> - <property name="text"> - <string>Show in Pane</string> - </property> - </item> - <item> - <property name="text"> - <string>Replace Selection</string> - </property> - </item> - </widget> - </item> - <item row="7" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Environment:</string> - </property> - </widget> - </item> - <item row="7" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <property name="spacing"> - <number>0</number> - </property> - <item> - <widget class="QLabel" name="environmentLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>No changes to apply.</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="environmentButton"> - <property name="text"> - <string>Change...</string> - </property> - </widget> - </item> - </layout> - </item> - <item row="8" column="1"> - <widget class="QCheckBox" name="modifiesDocumentCheckbox"> - <property name="toolTip"> - <string>If the tool modifies the current document, set this flag to ensure that the document is saved before running the tool and is reloaded after the tool finished.</string> - </property> - <property name="text"> - <string>Modifies current document</string> - </property> - </widget> - </item> - <item row="9" column="0"> - <widget class="QLabel" name="inputLabel"> - <property name="toolTip"> - <string>Text to pass to the executable via standard input. Leave empty if the executable should not receive any input.</string> - </property> - <property name="text"> - <string>Input:</string> - </property> - </widget> - </item> - <item row="9" column="1"> - <widget class="QPlainTextEdit" name="inputText"> - <property name="lineWrapMode"> - <enum>QPlainTextEdit::NoWrap</enum> - </property> - </widget> - </item> - <item row="6" column="0"> - <widget class="QLabel" name="baseEnvironmentLabel"> - <property name="text"> - <string>Base environment:</string> - </property> - </widget> - </item> - <item row="6" column="1"> - <widget class="QComboBox" name="baseEnvironment"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - </layout> + </property> + <property name="text"> + <string>Error output:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QComboBox" name="errorOutputBehavior"> + <item> + <property name="text"> + <string>Ignore</string> + </property> + </item> + <item> + <property name="text"> + <string>Show in Pane</string> + </property> + </item> + <item> + <property name="text"> + <string>Replace Selection</string> + </property> + </item> + </widget> + </item> + <item row="7" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Environment:</string> + </property> + </widget> + </item> + <item row="7" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="environmentLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>No changes to apply.</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="environmentButton"> + <property name="text"> + <string>Change...</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="8" column="1"> + <widget class="QCheckBox" name="modifiesDocumentCheckbox"> + <property name="toolTip"> + <string>If the tool modifies the current document, set this flag to ensure that the document is saved before running the tool and is reloaded after the tool finished.</string> + </property> + <property name="text"> + <string>Modifies current document</string> + </property> + </widget> + </item> + <item row="9" column="0"> + <widget class="QLabel" name="inputLabel"> + <property name="toolTip"> + <string>Text to pass to the executable via standard input. Leave empty if the executable should not receive any input.</string> + </property> + <property name="text"> + <string>Input:</string> + </property> + </widget> + </item> + <item row="9" column="1"> + <widget class="QPlainTextEdit" name="inputText"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>10</verstretch> + </sizepolicy> + </property> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> + </property> + </widget> + </item> + <item row="6" column="0"> + <widget class="QLabel" name="baseEnvironmentLabel"> + <property name="text"> + <string>Base environment:</string> + </property> + </widget> + </item> + <item row="6" column="1"> + <widget class="QComboBox" name="baseEnvironment"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> </widget> </item> </layout> diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index ddb91fe469..596d498875 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -56,6 +56,11 @@ #include <QStyle> #include <QStyledItemDelegate> +const int kInitialWidth = 750; +const int kInitialHeight = 450; +const int kMaxMinimumWidth = 250; +const int kMaxMinimumHeight = 250; + static const char pageKeyC[] = "General/LastPreferencePage"; const int categoryIconSize = 24; @@ -362,8 +367,8 @@ private: QSize minSize = inner->minimumSizeHint(); minSize += QSize(fw, fw); minSize += QSize(scrollBarWidth(), 0); - minSize.setHeight(qMin(minSize.height(), 450)); - minSize.setWidth(qMin(minSize.width(), 810)); + minSize.setWidth(qMin(minSize.width(), kMaxMinimumWidth)); + minSize.setHeight(qMin(minSize.height(), kMaxMinimumHeight)); return minSize; } return QSize(0, 0); @@ -547,7 +552,6 @@ void SettingsDialog::createGui() m_stackedLayout->setMargin(0); QWidget *emptyWidget = new QWidget(this); - emptyWidget->setMinimumSize(QSize(500, 500)); m_stackedLayout->addWidget(emptyWidget); // no category selected, for example when filtering QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | @@ -740,6 +744,8 @@ bool SettingsDialog::execDialog() static const QLatin1String kPreferenceDialogSize("Core/PreferenceDialogSize"); if (ICore::settings()->contains(kPreferenceDialogSize)) resize(ICore::settings()->value(kPreferenceDialogSize).toSize()); + else + resize(kInitialWidth, kInitialHeight); exec(); m_running = false; m_instance = nullptr; diff --git a/src/plugins/cpptools/CppTools.json.in b/src/plugins/cpptools/CppTools.json.in index 22fb394e41..3b7680337d 100644 --- a/src/plugins/cpptools/CppTools.json.in +++ b/src/plugins/cpptools/CppTools.json.in @@ -54,6 +54,11 @@ \" <!-- Additions to freedesktop: -->\", \" <glob pattern=\'*.h\' weight=\'70\'/>\", \" <glob pattern=\'*.H\' weight=\'70\'/>\", + \" <glob pattern=\'*.inl\' weight=\'70\'/>\", + \" <glob pattern=\'*.tcc\' weight=\'70\'/>\", + \" <glob pattern=\'*.tpp\' weight=\'70\'/>\", + \" <glob pattern=\'*.t++\' weight=\'70\'/>\", + \" <glob pattern=\'*.txx\' weight=\'70\'/>\", \" <!-- Find include guards of header files without extension, for\", \" example, STL ones like <string>. Those can have a big initial\", \" comment exceeding 1000 chars, though. -->\", @@ -74,11 +79,6 @@ \" <glob pattern=\'*.c++\' weight=\'70\'/>\", \" <!-- Additions to freedesktop: -->\", \" <glob pattern=\'*.cp\' weight=\'70\'/>\", - \" <glob pattern=\'*.inl\' weight=\'70\'/>\", - \" <glob pattern=\'*.tcc\' weight=\'70\'/>\", - \" <glob pattern=\'*.tpp\' weight=\'70\'/>\", - \" <glob pattern=\'*.t++\' weight=\'70\'/>\", - \" <glob pattern=\'*.txx\' weight=\'70\'/>\", \" <magic priority=\'30\'>\", \" <match value=\'-*- C++ -*-\' type=\'string\' offset=\'0:30\'/>\", \" </magic>\", diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index faf3b16b26..d4cd874a4b 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -102,6 +102,8 @@ public: TextMark::updateLineNumber(lineNumber); QTC_ASSERT(m_bp, return); m_bp->setLineNumber(lineNumber); + if (GlobalBreakpoint gbp = m_bp->globalBreakpoint()) + gbp->m_params.lineNumber = lineNumber; } void updateFileName(const FileName &fileName) final @@ -109,6 +111,8 @@ public: TextMark::updateFileName(fileName); QTC_ASSERT(m_bp, return); m_bp->setFileName(fileName.toString()); + if (GlobalBreakpoint gbp = m_bp->globalBreakpoint()) + gbp->m_params.fileName = fileName.toString(); } bool isDraggable() const final { return true; } diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp index 241770c437..1486e7a08c 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.cpp +++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp @@ -67,6 +67,7 @@ DebuggerKitConfigWidget::DebuggerKitConfigWidget(Kit *workingCopy, const KitInfo : KitConfigWidget(workingCopy, ki) { m_comboBox = new QComboBox; + m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); m_comboBox->setEnabled(true); refresh(); diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index b58b9300b8..04948cb219 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -203,7 +203,7 @@ static QVector<FolderNode *> renamableFolderNodes(const Utils::FileName &before, ProjectTree::forEachNode([&](Node *node) { if (node->nodeType() == NodeType::File && node->filePath() == before && node->parentFolderNode() - && node->parentFolderNode()->renameFile(before.toString(), after.toString())) { + && node->parentFolderNode()->canRenameFile(before.toString(), after.toString())) { folderNodes.append(node->parentFolderNode()); } }); @@ -239,7 +239,7 @@ bool FolderNavigationModel::setData(const QModelIndex &index, const QVariant &va Utils::FileName::fromString(afterFilePath)); QVector<FolderNode *> failedNodes; for (FolderNode *folder : folderNodes) { - if (!folder->canRenameFile(beforeFilePath, afterFilePath)) + if (!folder->renameFile(beforeFilePath, afterFilePath)) failedNodes.append(folder); } if (!failedNodes.isEmpty()) { diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index d979367f87..b1fcbcb6be 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -150,6 +150,7 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Kit *k, const foreach (Core::Id l, languageList) { layout->addWidget(new QLabel(ToolChainManager::displayNameOfLanguageId(l) + ':'), row, 0); auto cb = new QComboBox; + cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy()); cb->setToolTip(toolTip()); m_languageComboboxMap.insert(l, cb); @@ -325,6 +326,7 @@ DeviceInformationConfigWidget::DeviceInformationConfigWidget(Kit *workingCopy, c m_comboBox(new QComboBox), m_model(new DeviceManagerModel(DeviceManager::instance())) { + m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); m_comboBox->setModel(m_model); m_manageButton = new QPushButton(KitConfigWidget::msgManage()); diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.cpp b/src/plugins/projectexplorer/toolchainconfigwidget.cpp index 2bfe9b3403..96e021a867 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.cpp +++ b/src/plugins/projectexplorer/toolchainconfigwidget.cpp @@ -47,7 +47,6 @@ ToolChainConfigWidget::ToolChainConfigWidget(ToolChain *tc) : auto centralWidget = new Utils::DetailsWidget; centralWidget->setState(Utils::DetailsWidget::NoSummary); - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setFrameShape(QFrame::NoFrame); setWidgetResizable(true); setFocusPolicy(Qt::NoFocus); diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp index 308caa4719..f32330916d 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp @@ -77,7 +77,8 @@ void AndroidQmakeBuildConfiguration::initialize(const BuildInfo *info) void AndroidQmakeBuildConfiguration::addToEnvironment(Utils::Environment &env) const { - QString androidNdkPlatform = AndroidConfigurations::currentConfig().bestNdkPlatformMatch(AndroidManager::minimumSDK(target())); + QString androidNdkPlatform = AndroidConfigurations::currentConfig().bestNdkPlatformMatch( + qMax(AndroidManager::minimumNDK(target()), AndroidManager::minimumSDK(target()))); env.set(QLatin1String("ANDROID_NDK_PLATFORM"), androidNdkPlatform); } diff --git a/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp b/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp index 11fcad983f..9a1529414a 100644 --- a/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp @@ -99,13 +99,24 @@ QWidget *ZoomAction::createWidget(QWidget *parent) } comboBox->setCurrentIndex(m_currentComboBoxIndex); + comboBox->setToolTip(comboBox->currentText()); connect(this, &ZoomAction::reseted, comboBox, [this, comboBox]() { blockSignals(true); comboBox->setCurrentIndex(m_currentComboBoxIndex); blockSignals(false); }); connect(comboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), - this, &ZoomAction::emitZoomLevelChanged); + [this, comboBox](int index) { + m_currentComboBoxIndex = index; + + if (index == -1) + return; + + const QModelIndex modelIndex(m_comboBoxModel.data()->index(index, 0)); + setZoomLevel(m_comboBoxModel.data()->data(modelIndex, Qt::UserRole).toFloat()); + comboBox->setToolTip(modelIndex.data().toString()); + }); + connect(this, &ZoomAction::indexChanged, comboBox, &QComboBox::setCurrentIndex); comboBox->setProperty("hideborder", true); @@ -113,15 +124,4 @@ QWidget *ZoomAction::createWidget(QWidget *parent) return comboBox; } -void ZoomAction::emitZoomLevelChanged(int index) -{ - m_currentComboBoxIndex = index; - - if (index == -1) - return; - - const QModelIndex modelIndex(m_comboBoxModel.data()->index(index, 0)); - setZoomLevel(m_comboBoxModel.data()->data(modelIndex, Qt::UserRole).toFloat()); -} - } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/components/componentcore/zoomaction.h b/src/plugins/qmldesigner/components/componentcore/zoomaction.h index 2bf0219124..e93298d137 100644 --- a/src/plugins/qmldesigner/components/componentcore/zoomaction.h +++ b/src/plugins/qmldesigner/components/componentcore/zoomaction.h @@ -57,9 +57,6 @@ signals: void reseted(); private: - void emitZoomLevelChanged(int index); - -private: QPointer<QAbstractItemModel> m_comboBoxModel; float m_zoomLevel; int m_currentComboBoxIndex; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index 98df2867fc..0467355bf4 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -88,7 +88,7 @@ PropertyEditorView::PropertyEditorView(QWidget *parent) : m_stackedWidget->setStyleSheet(Theme::replaceCssColors( QString::fromUtf8(Utils::FileReader::fetchQrc(QStringLiteral(":/qmldesigner/stylesheet.css"))))); - m_stackedWidget->setMinimumWidth(320); + m_stackedWidget->setMinimumWidth(340); m_stackedWidget->move(0, 0); connect(m_stackedWidget, &PropertyEditorWidget::resized, this, &PropertyEditorView::updateSize); diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index 51e88892ac..fa2147f9b6 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -109,6 +109,8 @@ public: void reactivateTextMofifierChangeSignals(); void deactivateTextMofifierChangeSignals(); + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; + Internal::ModelNodePositionStorage *positionStorage() const; QList<DocumentMessage> warnings() const; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 9a8527e659..62f12d910c 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -26,8 +26,6 @@ #include "nodeinstanceview.h" #include <QUrl> -#include <QGraphicsView> -#include <QGraphicsScene> #include <QMultiHash> #include <QTimerEvent> diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index d409d1b93b..72f8ff1e3a 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -387,6 +387,17 @@ void RewriterView::deactivateTextMofifierChangeSignals() textModifier()->deactivateChangeSignals(); } +void RewriterView::auxiliaryDataChanged(const ModelNode &, const PropertyName &name, const QVariant &) +{ + if (name.endsWith("@NodeInstance")) + return; + + if (name.endsWith("@Internal")) + return; + + m_textModifier->textDocument()->setModified(true); +} + void RewriterView::applyModificationGroupChanges() { Q_ASSERT(transactionLevel == 0); @@ -498,8 +509,13 @@ QString RewriterView::auxiliaryDataAsQML() const const QVariant value = data.value(key.toUtf8()); QString strValue = value.toString(); - if (static_cast<QMetaType::Type>(value.type()) == QMetaType::QString) + + auto metaType = static_cast<QMetaType::Type>(value.type()); + + if (metaType == QMetaType::QString + || metaType == QMetaType::QColor) { strValue = "\"" + strValue + "\""; + } if (!strValue.isEmpty()) { str += replaceIllegalPropertyNameChars(key) + ":"; diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp index d9dfca08fc..53c6421038 100644 --- a/src/plugins/qtsupport/qtkitconfigwidget.cpp +++ b/src/plugins/qtsupport/qtkitconfigwidget.cpp @@ -44,6 +44,7 @@ QtKitConfigWidget::QtKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplo KitConfigWidget(k, ki) { m_combo = new QComboBox; + m_combo->setSizePolicy(QSizePolicy::Ignored, m_combo->sizePolicy().verticalPolicy()); m_combo->addItem(tr("None"), -1); QList<int> versionIds = Utils::transform(QtVersionManager::versions(), &BaseQtVersion::uniqueId); diff --git a/src/plugins/texteditor/colorschemeedit.cpp b/src/plugins/texteditor/colorschemeedit.cpp index 0c1c47d7cd..5f999835c5 100644 --- a/src/plugins/texteditor/colorschemeedit.cpp +++ b/src/plugins/texteditor/colorschemeedit.cpp @@ -152,6 +152,8 @@ ColorSchemeEdit::ColorSchemeEdit(QWidget *parent) : { setContentsMargins(0, layoutSpacing, 0, 0); m_ui->setupUi(this); + m_ui->detailsScrollArea->viewport()->setAutoFillBackground(false); + m_ui->scrollAreaWidgetContents->setAutoFillBackground(false); m_ui->itemList->setModel(m_formatsModel); populateUnderlineStyleComboBox(); diff --git a/src/plugins/texteditor/colorschemeedit.ui b/src/plugins/texteditor/colorschemeedit.ui index fa31aa590d..e9bb34596b 100644 --- a/src/plugins/texteditor/colorschemeedit.ui +++ b/src/plugins/texteditor/colorschemeedit.ui @@ -7,10 +7,10 @@ <x>0</x> <y>0</y> <width>462</width> - <height>389</height> + <height>416</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0"> + <layout class="QHBoxLayout" name="horizontalLayout"> <property name="leftMargin"> <number>0</number> </property> @@ -23,296 +23,11 @@ <property name="bottomMargin"> <number>0</number> </property> - <property name="verticalSpacing"> - <number>0</number> - </property> - <item row="5" column="1" colspan="3"> - <widget class="QLabel" name="relativeForegroundHeadline"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Relative Foreground</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="foregroundLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Foreground:</string> - </property> - <property name="buddy"> - <cstring>foregroundToolButton</cstring> - </property> - </widget> - </item> - <item row="10" column="1" colspan="3"> - <widget class="QWidget" name="relativeForegroundSpacer3" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>18</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>18</height> - </size> - </property> - </widget> - </item> - <item row="9" column="1"> - <widget class="QLabel" name="foregroundLightnessLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Lightness:</string> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QToolButton" name="foregroundToolButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="26" column="1" colspan="3"> - <spacer name="spacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="3"> - <widget class="QToolButton" name="eraseBackgroundToolButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Erase background.</string> - </property> - <property name="text"> - <string>x</string> - </property> - <property name="arrowType"> - <enum>Qt::LeftArrow</enum> - </property> - </widget> - </item> - <item row="14" column="1" colspan="3"> - <widget class="QWidget" name="relativeBackgroundSpacer2" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>6</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>6</height> - </size> - </property> - </widget> - </item> - <item row="7" column="2" colspan="2"> - <widget class="QDoubleSpinBox" name="foregroundSaturationSpinBox"> - <property name="minimum"> - <double>-1.000000000000000</double> - </property> - <property name="maximum"> - <double>1.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.050000000000000</double> - </property> - </widget> - </item> - <item row="15" column="1"> - <widget class="QLabel" name="backgroundLightnessLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Lightness:</string> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="QToolButton" name="eraseForegroundToolButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Erase foreground.</string> - </property> - <property name="text"> - <string>x</string> - </property> - <property name="arrowType"> - <enum>Qt::LeftArrow</enum> - </property> - </widget> - </item> - <item row="13" column="1"> - <widget class="QLabel" name="backgroundSaturationLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Saturation:</string> - </property> - </widget> - </item> - <item row="19" column="2" colspan="2"> - <widget class="QCheckBox" name="italicCheckBox"> - <property name="text"> - <string>Italic</string> - </property> - </widget> - </item> - <item row="9" column="2" colspan="2"> - <widget class="QDoubleSpinBox" name="foregroundLightnessSpinBox"> - <property name="minimum"> - <double>-1.000000000000000</double> - </property> - <property name="maximum"> - <double>1.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.050000000000000</double> - </property> - </widget> - </item> - <item row="6" column="1" colspan="3"> - <widget class="QWidget" name="relativeForegroundSpacer1" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>6</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>6</height> - </size> - </property> - </widget> - </item> - <item row="13" column="2" colspan="2"> - <widget class="QDoubleSpinBox" name="backgroundSaturationSpinBox"> - <property name="minimum"> - <double>-1.000000000000000</double> - </property> - <property name="maximum"> - <double>1.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.050000000000000</double> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLabel" name="backgroundLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Background:</string> - </property> - <property name="buddy"> - <cstring>backgroundToolButton</cstring> - </property> - </widget> - </item> - <item row="4" column="1" colspan="3"> - <widget class="QWidget" name="backgroundSpacer" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>18</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>18</height> - </size> - </property> - </widget> - </item> - <item row="0" column="0" rowspan="27"> + <item> <widget class="QListView" name="itemList"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>1</horstretch> + <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> @@ -324,316 +39,650 @@ </property> </widget> </item> - <item row="17" column="1"> - <widget class="QLabel" name="fontHeadline"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Font</string> - </property> - </widget> - </item> - <item row="7" column="1"> - <widget class="QLabel" name="foregroundSaturationLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Saturation:</string> - </property> - </widget> - </item> - <item row="19" column="1"> - <widget class="QCheckBox" name="boldCheckBox"> - <property name="text"> - <string>Bold</string> - </property> - </widget> - </item> - <item row="18" column="1" colspan="3"> - <widget class="QWidget" name="fontSpacer1" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>6</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>6</height> - </size> - </property> - </widget> - </item> - <item row="12" column="1" colspan="3"> - <widget class="QWidget" name="relativeBackgroundSpacer1" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>6</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>6</height> - </size> - </property> - </widget> - </item> - <item row="16" column="1" colspan="3"> - <widget class="QWidget" name="relativeBackgroundSpacer3" native="true"> + <item> + <widget class="QScrollArea" name="detailsScrollArea"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <sizepolicy hsizetype="Fixed" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>18</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>18</height> - </size> - </property> - </widget> - </item> - <item row="24" column="1" colspan="3"> - <widget class="QWidget" name="underlineSpacer2" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>6</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>6</height> - </size> - </property> - </widget> - </item> - <item row="22" column="1" colspan="3"> - <widget class="QWidget" name="underlineSpacer1" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>6</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>6</height> - </size> - </property> - </widget> - </item> - <item row="23" column="2"> - <widget class="QToolButton" name="underlineColorToolButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="21" column="1"> - <widget class="QLabel" name="underlineHeadline"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Underline</string> - </property> - </widget> - </item> - <item row="23" column="1"> - <widget class="QLabel" name="underlineLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Color:</string> - </property> - <property name="buddy"> - <cstring>backgroundToolButton</cstring> - </property> - </widget> - </item> - <item row="11" column="1" colspan="3"> - <widget class="QLabel" name="relativeBackgroundHeadline"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Relative Background</string> - </property> - </widget> - </item> - <item row="20" column="1" colspan="3"> - <widget class="QWidget" name="fontSpacer2" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>18</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>18</height> - </size> - </property> - </widget> - </item> - <item row="15" column="2" colspan="2"> - <widget class="QDoubleSpinBox" name="backgroundLightnessSpinBox"> - <property name="minimum"> - <double>-1.000000000000000</double> - </property> - <property name="maximum"> - <double>1.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.050000000000000</double> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="QToolButton" name="backgroundToolButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="23" column="3"> - <widget class="QToolButton" name="eraseUnderlineColorToolButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Erase background.</string> - </property> - <property name="text"> - <string>x</string> - </property> - <property name="arrowType"> - <enum>Qt::LeftArrow</enum> - </property> - </widget> - </item> - <item row="25" column="1" colspan="3"> - <widget class="QComboBox" name="underlineComboBox"/> - </item> - <item row="8" column="1" colspan="3"> - <widget class="QWidget" name="relativeForegroundSpacer2" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>6</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>6</height> - </size> - </property> - </widget> - </item> - <item row="2" column="1" colspan="3"> - <widget class="QWidget" name="foregroundSpacer" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>6</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>6</height> - </size> - </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QAbstractScrollArea::AdjustToContents</enum> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>212</width> + <height>390</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0"> + <property name="sizeConstraint"> + <enum>QLayout::SetFixedSize</enum> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>20</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <property name="verticalSpacing"> + <number>0</number> + </property> + <item row="5" column="0" colspan="3"> + <widget class="QLabel" name="relativeForegroundHeadline"> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Relative Foreground</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="foregroundLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Foreground:</string> + </property> + <property name="buddy"> + <cstring>foregroundToolButton</cstring> + </property> + </widget> + </item> + <item row="10" column="0" colspan="3"> + <widget class="QWidget" name="relativeForegroundSpacer3" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>18</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + </widget> + </item> + <item row="9" column="0"> + <widget class="QLabel" name="foregroundLightnessLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Lightness:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QToolButton" name="foregroundToolButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="26" column="0" colspan="3"> + <spacer name="spacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="2"> + <widget class="QToolButton" name="eraseBackgroundToolButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Erase background.</string> + </property> + <property name="text"> + <string>x</string> + </property> + <property name="arrowType"> + <enum>Qt::LeftArrow</enum> + </property> + </widget> + </item> + <item row="14" column="0" colspan="3"> + <widget class="QWidget" name="relativeBackgroundSpacer2" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>6</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>6</height> + </size> + </property> + </widget> + </item> + <item row="7" column="1" colspan="2"> + <widget class="QDoubleSpinBox" name="foregroundSaturationSpinBox"> + <property name="minimum"> + <double>-1.000000000000000</double> + </property> + <property name="maximum"> + <double>1.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.050000000000000</double> + </property> + </widget> + </item> + <item row="15" column="0"> + <widget class="QLabel" name="backgroundLightnessLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Lightness:</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QToolButton" name="eraseForegroundToolButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Erase foreground.</string> + </property> + <property name="text"> + <string>x</string> + </property> + <property name="arrowType"> + <enum>Qt::LeftArrow</enum> + </property> + </widget> + </item> + <item row="13" column="0"> + <widget class="QLabel" name="backgroundSaturationLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Saturation:</string> + </property> + </widget> + </item> + <item row="19" column="1" colspan="2"> + <widget class="QCheckBox" name="italicCheckBox"> + <property name="text"> + <string>Italic</string> + </property> + </widget> + </item> + <item row="9" column="1" colspan="2"> + <widget class="QDoubleSpinBox" name="foregroundLightnessSpinBox"> + <property name="minimum"> + <double>-1.000000000000000</double> + </property> + <property name="maximum"> + <double>1.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.050000000000000</double> + </property> + </widget> + </item> + <item row="6" column="0" colspan="3"> + <widget class="QWidget" name="relativeForegroundSpacer1" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>6</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>6</height> + </size> + </property> + </widget> + </item> + <item row="13" column="1" colspan="2"> + <widget class="QDoubleSpinBox" name="backgroundSaturationSpinBox"> + <property name="minimum"> + <double>-1.000000000000000</double> + </property> + <property name="maximum"> + <double>1.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.050000000000000</double> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="backgroundLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Background:</string> + </property> + <property name="buddy"> + <cstring>backgroundToolButton</cstring> + </property> + </widget> + </item> + <item row="4" column="0" colspan="3"> + <widget class="QWidget" name="backgroundSpacer" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>18</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + </widget> + </item> + <item row="17" column="0"> + <widget class="QLabel" name="fontHeadline"> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Font</string> + </property> + </widget> + </item> + <item row="7" column="0"> + <widget class="QLabel" name="foregroundSaturationLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Saturation:</string> + </property> + </widget> + </item> + <item row="19" column="0"> + <widget class="QCheckBox" name="boldCheckBox"> + <property name="text"> + <string>Bold</string> + </property> + </widget> + </item> + <item row="18" column="0" colspan="3"> + <widget class="QWidget" name="fontSpacer1" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>6</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>6</height> + </size> + </property> + </widget> + </item> + <item row="12" column="0" colspan="3"> + <widget class="QWidget" name="relativeBackgroundSpacer1" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>6</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>6</height> + </size> + </property> + </widget> + </item> + <item row="16" column="0" colspan="3"> + <widget class="QWidget" name="relativeBackgroundSpacer3" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>18</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + </widget> + </item> + <item row="24" column="0" colspan="3"> + <widget class="QWidget" name="underlineSpacer2" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>6</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>6</height> + </size> + </property> + </widget> + </item> + <item row="22" column="0" colspan="3"> + <widget class="QWidget" name="underlineSpacer1" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>6</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>6</height> + </size> + </property> + </widget> + </item> + <item row="23" column="1"> + <widget class="QToolButton" name="underlineColorToolButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="21" column="0"> + <widget class="QLabel" name="underlineHeadline"> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Underline</string> + </property> + </widget> + </item> + <item row="23" column="0"> + <widget class="QLabel" name="underlineLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Color:</string> + </property> + <property name="buddy"> + <cstring>backgroundToolButton</cstring> + </property> + </widget> + </item> + <item row="11" column="0" colspan="3"> + <widget class="QLabel" name="relativeBackgroundHeadline"> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Relative Background</string> + </property> + </widget> + </item> + <item row="20" column="0" colspan="3"> + <widget class="QWidget" name="fontSpacer2" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>18</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + </widget> + </item> + <item row="15" column="1" colspan="2"> + <widget class="QDoubleSpinBox" name="backgroundLightnessSpinBox"> + <property name="minimum"> + <double>-1.000000000000000</double> + </property> + <property name="maximum"> + <double>1.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.050000000000000</double> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QToolButton" name="backgroundToolButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="23" column="2"> + <widget class="QToolButton" name="eraseUnderlineColorToolButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Erase background.</string> + </property> + <property name="text"> + <string>x</string> + </property> + <property name="arrowType"> + <enum>Qt::LeftArrow</enum> + </property> + </widget> + </item> + <item row="25" column="0" colspan="3"> + <widget class="QComboBox" name="underlineComboBox"/> + </item> + <item row="8" column="0" colspan="3"> + <widget class="QWidget" name="relativeForegroundSpacer2" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>6</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>6</height> + </size> + </property> + </widget> + </item> + <item row="2" column="0" colspan="3"> + <widget class="QWidget" name="foregroundSpacer" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>6</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>6</height> + </size> + </property> + </widget> + </item> + </layout> + </widget> </widget> </item> </layout> diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui index c47c4eb940..8c3a0baa50 100644 --- a/src/plugins/texteditor/fontsettingspage.ui +++ b/src/plugins/texteditor/fontsettingspage.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>614</width> + <width>639</width> <height>306</height> </rect> </property> @@ -173,7 +173,7 @@ <item row="1" column="0" colspan="3"> <widget class="TextEditor::Internal::ColorSchemeEdit" name="schemeEdit" native="true"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>1</verstretch> </sizepolicy> diff --git a/src/plugins/updateinfo/settingspage.ui b/src/plugins/updateinfo/settingspage.ui index de6357b956..5efc6b1b88 100644 --- a/src/plugins/updateinfo/settingspage.ui +++ b/src/plugins/updateinfo/settingspage.ui @@ -135,12 +135,6 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>233</height> - </size> - </property> </spacer> </item> </layout> diff --git a/src/tools/clangbackend/source/tokeninfo.cpp b/src/tools/clangbackend/source/tokeninfo.cpp index b7e40d0327..de40a954e1 100644 --- a/src/tools/clangbackend/source/tokeninfo.cpp +++ b/src/tools/clangbackend/source/tokeninfo.cpp @@ -372,7 +372,8 @@ void TokenInfo::identifierKind(const Cursor &cursor, Recursion recursion) break; case CXCursor_ParmDecl: case CXCursor_VarDecl: - variableKind(cursor); + case CXCursor_VariableRef: + variableKind(cursor.referenced()); break; case CXCursor_DeclRefExpr: identifierKind(cursor.referenced(), Recursion::RecursivePass); |