From 69c8b9271c14e0866b3a39ee5dd5cc7f58edd631 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 5 Jul 2016 16:52:32 +0200 Subject: fix qt namespace retrieval when an early break happened the logic to retrigger the namespace retrieval was broken, so if it was triggered for some reason before qt was "sufficiently available", the bad/failed guess would persist. Change-Id: I90e02247142814bdc3f6d5cddfc0c2fe37665a3e Done-with: hjk Reviewed-by: hjk --- share/qtcreator/debugger/gdbbridge.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index f228b76351..f835249442 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -256,11 +256,6 @@ class Dumper(DumperBase): self.qtNamespaceToReport = None self.interpreterBreakpointResolvers = [] - # The guess does not need to be updated during a fetchVariables() - # as the result is fixed during that time (ignoring "active" - # dumpers causing loading of shared objects etc). - self.currentQtNamespaceGuess = None - def prepare(self, args): self.output = [] self.currentIName = "" @@ -294,6 +289,11 @@ class Dumper(DumperBase): #warn("EXPANDED INAMES: %s" % self.expandedINames) #warn("WATCHERS: %s" % self.watchers) + # The guess does not need to be updated during a fetchVariables() + # as the result is fixed during that time (ignoring "active" + # dumpers causing loading of shared objects etc). + self.currentQtNamespaceGuess = None + def listOfLocals(self): frame = gdb.selected_frame() -- cgit v1.2.1 From 7f07ec41abb8194cafa19863af183e5e7f971edf Mon Sep 17 00:00:00 2001 From: Brett Stottlemyer Date: Sat, 9 Jul 2016 09:48:27 -0400 Subject: [test] Use command line in proparser The test reads the command line, but skipped the commit. Change-Id: If38a5fdd1ec129d77065bfd90403e21fea4eda6d Reviewed-by: Oswald Buddenhagen --- tests/manual/proparser/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp index 4555383b7b..60067fd92d 100644 --- a/tests/manual/proparser/main.cpp +++ b/tests/manual/proparser/main.cpp @@ -189,6 +189,8 @@ int main(int argc, char **argv) qCritical("usage: testreader [-v] [-d [-d]] [-c] [] []"); return 3; } + option.commitCommandLineArguments(state); + option.useEnvironment(); if (out_pwd.isEmpty()) out_pwd = in_pwd; option.setDirectories(in_pwd, out_pwd); -- cgit v1.2.1 From b47b9ea9511db6330db22c8abfd67658323430ea Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 19 Jul 2016 10:51:03 +0200 Subject: QML: Band-aid fix to prevent a crash If the document that FindExportedCppTypes is to search is not in the snapshot, skip over it (instead of passing the shared pointer with a null-value inside). Change-Id: I462e3d22aa4e1cc51e710c75ae0f9399c151240b Reviewed-by: Ulf Hermann Reviewed-by: Nikolai Kosjar --- src/libs/qmljs/qmljsfindexportedcpptypes.cpp | 3 +++ src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp index ff82a56cd5..e1c4d55de7 100644 --- a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp +++ b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -819,6 +820,8 @@ FindExportedCppTypes::FindExportedCppTypes(const CPlusPlus::Snapshot &snapshot) QStringList FindExportedCppTypes::operator()(const CPlusPlus::Document::Ptr &document) { + QTC_ASSERT(!document.isNull(), return QStringList()); + m_contextProperties.clear(); m_exportedTypes.clear(); QStringList fileNames; diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index a919087fea..bdd6e6eeab 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -1321,7 +1321,10 @@ void ModelManagerInterface::updateCppQmlTypes(QFutureInterface &interface, if (!scan) { hasNewInfo = newData.remove(fileName) > 0 || hasNewInfo; foreach (const QString &file, newDeclarations[fileName]) { - finder(snapshot.document(file)); + CPlusPlus::Document::Ptr doc = snapshot.document(file); + if (doc.isNull()) + continue; + finder(doc); hasNewInfo = rescanExports(file, finder, newData) || hasNewInfo; } continue; -- cgit v1.2.1 From 7037644252fd9cac6d4c2fb919542163453ad820 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 21 Jul 2016 09:19:30 +0200 Subject: Debugger: Show object address with LLDB if there is nothing better Mimic what GDB does. Change-Id: Ied3fff41339220eacc5c942b3f30e744f9f32a21 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/lldbbridge.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 8e4cb83ef1..afbff9099f 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -206,7 +206,7 @@ class Dumper(DumperBase): self.currentType = ReportItem() self.currentNumChild = None self.currentMaxNumChild = None - self.currentPrintsAddress = None + self.currentPrintsAddress = True self.currentChildType = None self.currentChildNumChild = -1 self.currentWatchers = {} @@ -250,12 +250,14 @@ class Dumper(DumperBase): if item.name == '**&': item.name = '*' self.put('name="%s",' % item.name) + item.savedCurrentAddress = self.currentAddress item.savedIName = self.currentIName item.savedValue = self.currentValue item.savedType = self.currentType self.currentIName = item.iname self.currentValue = ReportItem() self.currentType = ReportItem() + self.currentAddress = None def exitSubItem(self, item, exType, exValue, exTraceBack): if not exType is None: @@ -278,10 +280,13 @@ class Dumper(DumperBase): self.put('value="%s",' % self.currentValue.value) except: pass + if not self.currentAddress is None: + self.put(self.currentAddress) self.put('},') self.currentIName = item.savedIName self.currentValue = item.savedValue self.currentType = item.savedType + self.currentAddress = item.savedCurrentAddress return True def stateName(self, s): @@ -962,7 +967,7 @@ class Dumper(DumperBase): #if int(addr) == 0xffffffffffffffff: # raise RuntimeError("Illegal address") if self.currentPrintsAddress and not addr is None: - self.put('address="0x%x",' % int(addr)) + self.currentAddress = 'address="0x%x",' % toInteger(addr) def isFunctionType(self, typeobj): if self.isGoodLldb: @@ -1174,6 +1179,7 @@ class Dumper(DumperBase): return self.output = '' + self.currentAddress = None partialVariable = args.get('partialvar', "") isPartial = len(partialVariable) > 0 -- cgit v1.2.1 From 13fbcb2d3e26dc805155c1e83bead2c0371a4f38 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 25 Jul 2016 11:12:02 +0200 Subject: Debugger: Bump LLDB requirement to 3.8 on Linux There was an official release in June, and given that LLDB on Linux is still fragile, requiring at least the latest officially released version seems in order. Change-Id: Iabbdc654071b28166c7f9ea550eaa7db304cb4a0 Reviewed-by: Leena Miettinen --- doc/src/debugger/creator-debugger-setup.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc index 6a7e66d1ba..cd567cba35 100644 --- a/doc/src/debugger/creator-debugger-setup.qdoc +++ b/doc/src/debugger/creator-debugger-setup.qdoc @@ -137,7 +137,7 @@ On OS X you can use the LLDB version delivered with Xcode or build from source. The minimum supported version is LLDB 320.4. - On Linux, the minimum supported version is LLDB 3.7. + On Linux, the minimum supported version is LLDB 3.8. \omit -- cgit v1.2.1 From 98f7a00e7070c856c4a50a89eab6cb63b299db21 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 25 Jul 2016 11:58:28 +0200 Subject: Move "Ok", "Error" and "Notloaded" icons from ExtentionSystem to Utils These icons are useful in other situations (e.g. QmlDesigner) Change-Id: I31751b8ca8fea34c532d54d423e5fef07b370a4a Reviewed-by: Thomas Hartmann --- src/libs/extensionsystem/extensionsystem.pro | 4 ---- src/libs/extensionsystem/extensionsystem.qbs | 4 ---- src/libs/extensionsystem/images/error.png | Bin 137 -> 0 bytes src/libs/extensionsystem/images/error@2x.png | Bin 263 -> 0 bytes src/libs/extensionsystem/images/notloaded.png | Bin 94 -> 0 bytes src/libs/extensionsystem/images/notloaded@2x.png | Bin 96 -> 0 bytes src/libs/extensionsystem/images/ok.png | Bin 165 -> 0 bytes src/libs/extensionsystem/images/ok@2x.png | Bin 221 -> 0 bytes src/libs/extensionsystem/pluginview.cpp | 14 ++++---------- src/libs/extensionsystem/pluginview.qrc | 10 ---------- src/libs/utils/images/error.png | Bin 0 -> 137 bytes src/libs/utils/images/error@2x.png | Bin 0 -> 263 bytes src/libs/utils/images/notloaded.png | Bin 0 -> 94 bytes src/libs/utils/images/notloaded@2x.png | Bin 0 -> 96 bytes src/libs/utils/images/ok.png | Bin 0 -> 165 bytes src/libs/utils/images/ok@2x.png | Bin 0 -> 221 bytes src/libs/utils/utils.qrc | 6 ++++++ src/libs/utils/utilsicons.h | 6 ++++++ src/tools/icons/qtcreatoricons.svg | 6 +++--- 19 files changed, 19 insertions(+), 31 deletions(-) delete mode 100644 src/libs/extensionsystem/images/error.png delete mode 100644 src/libs/extensionsystem/images/error@2x.png delete mode 100644 src/libs/extensionsystem/images/notloaded.png delete mode 100644 src/libs/extensionsystem/images/notloaded@2x.png delete mode 100644 src/libs/extensionsystem/images/ok.png delete mode 100644 src/libs/extensionsystem/images/ok@2x.png delete mode 100644 src/libs/extensionsystem/pluginview.qrc create mode 100644 src/libs/utils/images/error.png create mode 100644 src/libs/utils/images/error@2x.png create mode 100644 src/libs/utils/images/notloaded.png create mode 100644 src/libs/utils/images/notloaded@2x.png create mode 100644 src/libs/utils/images/ok.png create mode 100644 src/libs/utils/images/ok@2x.png diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro index ec147aec93..dce2b19b17 100644 --- a/src/libs/extensionsystem/extensionsystem.pro +++ b/src/libs/extensionsystem/extensionsystem.pro @@ -37,7 +37,3 @@ FORMS += \ pluginerrorview.ui \ plugindetailsview.ui \ pluginerroroverview.ui -RESOURCES += pluginview.qrc - - - diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs index 003c591e7b..62c5b26ed5 100644 --- a/src/libs/extensionsystem/extensionsystem.qbs +++ b/src/libs/extensionsystem/extensionsystem.qbs @@ -43,10 +43,6 @@ Project { "pluginspec_p.h", "pluginview.cpp", "pluginview.h", - "pluginview.qrc", - "images/error.png", - "images/notloaded.png", - "images/ok.png", ] Export { diff --git a/src/libs/extensionsystem/images/error.png b/src/libs/extensionsystem/images/error.png deleted file mode 100644 index 3afb9548f6..0000000000 Binary files a/src/libs/extensionsystem/images/error.png and /dev/null differ diff --git a/src/libs/extensionsystem/images/error@2x.png b/src/libs/extensionsystem/images/error@2x.png deleted file mode 100644 index af6c94483e..0000000000 Binary files a/src/libs/extensionsystem/images/error@2x.png and /dev/null differ diff --git a/src/libs/extensionsystem/images/notloaded.png b/src/libs/extensionsystem/images/notloaded.png deleted file mode 100644 index 16de272cae..0000000000 Binary files a/src/libs/extensionsystem/images/notloaded.png and /dev/null differ diff --git a/src/libs/extensionsystem/images/notloaded@2x.png b/src/libs/extensionsystem/images/notloaded@2x.png deleted file mode 100644 index 902bf624cd..0000000000 Binary files a/src/libs/extensionsystem/images/notloaded@2x.png and /dev/null differ diff --git a/src/libs/extensionsystem/images/ok.png b/src/libs/extensionsystem/images/ok.png deleted file mode 100644 index 13d8dfaae2..0000000000 Binary files a/src/libs/extensionsystem/images/ok.png and /dev/null differ diff --git a/src/libs/extensionsystem/images/ok@2x.png b/src/libs/extensionsystem/images/ok@2x.png deleted file mode 100644 index 7dc3295fed..0000000000 Binary files a/src/libs/extensionsystem/images/ok@2x.png and /dev/null differ diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index 2dea6e1b25..6911475b53 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/src/libs/extensionsystem/pluginview.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include @@ -90,22 +90,16 @@ static const QIcon &icon(IconIndex icon) using namespace Utils; switch (icon) { case OkIcon: { - static const QIcon ok = - Icon({{QLatin1String(":/extensionsystem/images/ok.png"), - Theme::IconsRunToolBarColor}}, Icon::Tint).icon(); + static const QIcon ok = Utils::Icons::OK.icon(); return ok; } case ErrorIcon: { - static const QIcon error = - Icon({{QLatin1String(":/extensionsystem/images/error.png"), - Theme::IconsErrorColor}}, Icon::Tint).icon(); + static const QIcon error = Utils::Icons::ERROR.icon(); return error; } default: case NotLoadedIcon: { - static const QIcon notLoaded = - Icon({{QLatin1String(":/extensionsystem/images/notloaded.png"), - Theme::IconsErrorColor}}, Icon::Tint).icon(); + static const QIcon notLoaded = Utils::Icons::NOTLOADED.icon(); return notLoaded; } } diff --git a/src/libs/extensionsystem/pluginview.qrc b/src/libs/extensionsystem/pluginview.qrc deleted file mode 100644 index da218976eb..0000000000 --- a/src/libs/extensionsystem/pluginview.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - images/ok.png - images/ok@2x.png - images/error.png - images/error@2x.png - images/notloaded.png - images/notloaded@2x.png - - diff --git a/src/libs/utils/images/error.png b/src/libs/utils/images/error.png new file mode 100644 index 0000000000..3afb9548f6 Binary files /dev/null and b/src/libs/utils/images/error.png differ diff --git a/src/libs/utils/images/error@2x.png b/src/libs/utils/images/error@2x.png new file mode 100644 index 0000000000..af6c94483e Binary files /dev/null and b/src/libs/utils/images/error@2x.png differ diff --git a/src/libs/utils/images/notloaded.png b/src/libs/utils/images/notloaded.png new file mode 100644 index 0000000000..16de272cae Binary files /dev/null and b/src/libs/utils/images/notloaded.png differ diff --git a/src/libs/utils/images/notloaded@2x.png b/src/libs/utils/images/notloaded@2x.png new file mode 100644 index 0000000000..902bf624cd Binary files /dev/null and b/src/libs/utils/images/notloaded@2x.png differ diff --git a/src/libs/utils/images/ok.png b/src/libs/utils/images/ok.png new file mode 100644 index 0000000000..13d8dfaae2 Binary files /dev/null and b/src/libs/utils/images/ok.png differ diff --git a/src/libs/utils/images/ok@2x.png b/src/libs/utils/images/ok@2x.png new file mode 100644 index 0000000000..7dc3295fed Binary files /dev/null and b/src/libs/utils/images/ok@2x.png differ diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 035389c93b..604fda2a06 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -25,5 +25,11 @@ images/locked@2x.png images/unlocked.png images/unlocked@2x.png + images/error.png + images/error@2x.png + images/notloaded.png + images/notloaded@2x.png + images/ok.png + images/ok@2x.png diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 601907c2b0..aa74759f9c 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -50,6 +50,12 @@ const Utils::Icon ZOOM({ {QLatin1String(":/utils/images/zoom.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint); const Utils::Icon ZOOM_TOOLBAR({ {QLatin1String(":/utils/images/zoom.png"), Utils::Theme::IconsBaseColor}}); +const Utils::Icon OK({ + {QLatin1String(":/utils/images/ok.png"), Utils::Theme::IconsRunToolBarColor}}, Icon::Tint); +const Utils::Icon NOTLOADED({ + {QLatin1String(":/utils/images/notloaded.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint); +const Utils::Icon ERROR({ + {QLatin1String(":/utils/images/error.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint); } // namespace Icons } // namespace Utils diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index b39d8ed249..a757070432 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -1358,7 +1358,7 @@ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="src/libs/utils/images/ok"> Date: Mon, 25 Jul 2016 00:47:50 +0200 Subject: Utils: Get default error color from Theme The default Qt:red for the lineedit in Utils::PathChooser is unreadable in dark themes. This change ensures that the color comes from the current theme. Change-Id: I7b890bb18e4b996cf0a8f0ac3286da87dd33f5f2 Reviewed-by: Thomas Hartmann --- src/libs/utils/pathchooser.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index edf0384f2d..0e1d838e3c 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -30,6 +30,7 @@ #include "synchronousprocess.h" #include "hostosinfo.h" +#include "theme/theme.h" #include #include @@ -226,6 +227,7 @@ PathChooser::PathChooser(QWidget *parent) : connect(d->m_lineEdit, &QLineEdit::textChanged, this, [this] { emit pathChanged(path()); }); d->m_lineEdit->setMinimumWidth(120); + d->m_lineEdit->setErrorColor(creatorTheme()->color(Theme::TextColorError)); d->m_hLayout->addWidget(d->m_lineEdit); d->m_hLayout->setSizeConstraint(QLayout::SetMinimumSize); -- cgit v1.2.1 From 8067297edf25f05655a768484046efb85cfbe9c1 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 25 Jul 2016 13:27:22 +0200 Subject: QmlProfiler: Ignore messages in local runner test Depending on the build configuration of Qt and Qt Creator there can be various kinds of messages and we cannot reliably determine their number in advance. Change-Id: I162cc02a72200026d3cbe7498fa705911f4cda39 Reviewed-by: Christian Stenger --- .../tests/localqmlprofilerrunner_test.cpp | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp b/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp index 830b7101e2..34d5aacdd1 100644 --- a/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp +++ b/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp @@ -37,17 +37,6 @@ LocalQmlProfilerRunnerTest::LocalQmlProfilerRunnerTest(QObject *parent) : QObjec { } -bool checkErrors(const QStringList &errors, int number) -{ - if (errors.length() != number) { - qDebug() << "Found unexpected errors:" << errors; - return false; - } else { - return true; - } -} - - void LocalQmlProfilerRunnerTest::testRunner() { Debugger::AnalyzerConnection connection; @@ -64,7 +53,6 @@ void LocalQmlProfilerRunnerTest::testRunner() bool running = false; int runCount = 0; - QStringList errors; auto connectRunner = [&]() { connect(runner, &LocalQmlProfilerRunner::started, this, [&running, &runCount](){ @@ -76,13 +64,6 @@ void LocalQmlProfilerRunnerTest::testRunner() QVERIFY(running); running = false; }); - - connect(runner, &LocalQmlProfilerRunner::appendMessage, this, - [&errors](const QString &message, Utils::OutputFormat format) { - if (format == Utils::ErrorMessageFormat && message != - ProjectExplorer::ApplicationLauncher::msgWinCannotRetrieveDebuggingOutput()) - errors << message; - }); }; connectRunner(); @@ -91,7 +72,6 @@ void LocalQmlProfilerRunnerTest::testRunner() QTRY_COMPARE_WITH_TIMEOUT(runCount, 1, 10000); QTRY_VERIFY_WITH_TIMEOUT(!running, 10000); - QVERIFY(checkErrors(errors, 1)); configuration.socket = connection.analyzerSocket = LocalQmlProfilerRunner::findFreeSocket(); configuration.debuggee.executable = qApp->applicationFilePath(); @@ -109,7 +89,6 @@ void LocalQmlProfilerRunnerTest::testRunner() QTRY_COMPARE_WITH_TIMEOUT(runCount, 2, 10000); QTRY_VERIFY_WITH_TIMEOUT(!running, 10000); - QVERIFY(checkErrors(errors, 1)); delete rc; @@ -128,11 +107,9 @@ void LocalQmlProfilerRunnerTest::testRunner() QTRY_COMPARE_WITH_TIMEOUT(runCount, 3, 10000); QTest::qWait(1000); QVERIFY(running); // verify it doesn't spontaneously stop - QVERIFY(checkErrors(errors, 1)); rc->stop(); QTRY_VERIFY_WITH_TIMEOUT(!running, 10000); - QVERIFY(checkErrors(errors, 2)); // "The program has unexpectedly finished." delete rc; } -- cgit v1.2.1 From f562f867fcbab4482d2b1e6df4bd111dc738cd4c Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 22 Jul 2016 15:14:27 +0200 Subject: Squish: Use shadow builds in tst_simple_debug So MSVC2010 and MSVC2013 don't get in their way. Change-Id: Ib32c30dc0cc960756bb423348d88452aa20fbfcd Reviewed-by: Christian Stenger --- tests/system/objects.map | 1 + tests/system/suite_debugger/tst_simple_debug/test.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index 9c78f4ec13..b3a313a085 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -164,6 +164,7 @@ :Qt Creator_SearchResult_Core::Internal::OutputPaneToggleButton {occurrence='2' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_SystemSettings.Details_Utils::DetailsButton {occurrence='4' text='Details' type='Utils::DetailsButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_TextEditor::TextEditorWidget {type='TextEditor::TextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_Utils::BuildDirectoryLineEdit {occurrence='2' type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Utils::NavigationTreeView {type='Utils::NavigationTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit {container=':Qt Creator_Utils::NavigationTreeView' type='QExpandingLineEdit' unnamed='1' visible='1'} :Qt Gui Application.Form file:_QLabel {name='formLabel' text='Form file:' type='QLabel' visible='1' window=':Qt Gui Application_QmakeProjectManager::Internal::GuiAppWizardDialog'} diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index b6646b7f22..14c250acad 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -58,14 +58,20 @@ def main(): test.fatal("Haven't found a suitable Qt version - leaving without debugging.") for kit, config in availableConfigs: test.log("Selecting '%s' as build config" % config) - verifyBuildConfig(len(checkedTargets), kit, config, True, enableQmlDebug=True) + verifyBuildConfig(len(checkedTargets), kit, config, True, True, True) # explicitly build before start debugging for adding the executable as allowed program to WinFW invokeMenuItem("Build", "Rebuild All") waitForCompile(300000) if not checkCompile(): test.fatal("Compile had errors... Skipping current build config") continue - allowAppThroughWinFW(workingDir, projectName, False) + if platform.system() in ('Microsoft' 'Windows'): + switchViewTo(ViewConstants.PROJECTS) + switchToBuildOrRunSettingsFor(len(checkedTargets), kit, ProjectSettings.BUILD) + buildDir = os.path.join(str(waitForObject(":Qt Creator_Utils::BuildDirectoryLineEdit").text), + "debug") + switchViewTo(ViewConstants.EDIT) + allowAppThroughWinFW(buildDir, projectName, None) if not doSimpleDebugging(len(checkedTargets), kit, config, len(expectedBreakpointsOrder), expectedBreakpointsOrder): try: @@ -74,7 +80,8 @@ def main(): clickButton(stopB) except: pass - deleteAppFromWinFW(workingDir, projectName, False) + if platform.system() in ('Microsoft' 'Windows'): + deleteAppFromWinFW(buildDir, projectName, None) # close application output window of current run to avoid mixing older output on the next run ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") clickButton(waitForObject("{type='CloseButton' unnamed='1' visible='1' " -- cgit v1.2.1 From fe3f288f273db30fa04e3b5f2b9229e1f2844a84 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 21 Jul 2016 18:53:06 +0200 Subject: Debugger: Console: Allow the rows to have individual heights ...otherwise multi-line text would flow over the item. Change-Id: I98b8a45441150843638f3bd917f5e38f369729f3 Reviewed-by: hjk --- src/plugins/debugger/console/consoleview.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/debugger/console/consoleview.cpp b/src/plugins/debugger/console/consoleview.cpp index 4c5d7f1df1..db80e9cee6 100644 --- a/src/plugins/debugger/console/consoleview.cpp +++ b/src/plugins/debugger/console/consoleview.cpp @@ -80,7 +80,6 @@ ConsoleView::ConsoleView(ConsoleItemModel *model, QWidget *parent) : setFrameStyle(QFrame::NoFrame); setHeaderHidden(true); setRootIsDecorated(false); - setUniformRowHeights(true); setEditTriggers(QAbstractItemView::AllEditTriggers); setStyleSheet(QLatin1String("QTreeView::branch:has-siblings:!adjoins-item {" "border-image: none;" -- cgit v1.2.1 From 728b9147279ee71a000be71d7dd95334f50aa8ae Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 22 Jul 2016 08:57:32 +0200 Subject: CppEditor: Use full tooltip in ClangTextMark Change-Id: I39cc64acbdbcd5e5156e1514acaf9674a91e81a4 Reviewed-by: Nikolai Kosjar --- src/libs/utils/tooltip/tooltip.cpp | 12 +++++++++++ src/libs/utils/tooltip/tooltip.h | 3 +++ .../clangcodemodel/clangdiagnosticmanager.cpp | 5 +---- .../clangdiagnostictooltipwidget.cpp | 23 +++++++--------------- .../clangcodemodel/clangdiagnostictooltipwidget.h | 13 ++++-------- .../clangeditordocumentprocessor.cpp | 15 +++++--------- .../clangcodemodel/clangeditordocumentprocessor.h | 5 +---- src/plugins/clangcodemodel/clangtextmark.cpp | 15 +++++++++++--- src/plugins/clangcodemodel/clangtextmark.h | 6 +++++- src/plugins/cppeditor/cpphoverhandler.cpp | 11 +++++++++-- .../cpptools/baseeditordocumentprocessor.cpp | 2 +- src/plugins/cpptools/baseeditordocumentprocessor.h | 5 +---- src/plugins/texteditor/texteditor.cpp | 17 ++++++++++------ src/plugins/texteditor/textmark.cpp | 8 ++++++++ src/plugins/texteditor/textmark.h | 2 ++ 15 files changed, 82 insertions(+), 60 deletions(-) diff --git a/src/libs/utils/tooltip/tooltip.cpp b/src/libs/utils/tooltip/tooltip.cpp index 7617403c81..9fdca7b7e8 100644 --- a/src/libs/utils/tooltip/tooltip.cpp +++ b/src/libs/utils/tooltip/tooltip.cpp @@ -28,6 +28,7 @@ #include "effects.h" #include "reuse.h" +#include #include #include @@ -85,6 +86,17 @@ void ToolTip::show(const QPoint &pos, QWidget *content, QWidget *w, const QStrin instance()->showInternal(pos, QVariant::fromValue(content), WidgetContent, w, helpId, rect); } +void ToolTip::show(const QPoint &pos, QLayout *content, QWidget *w, const QString &helpId, const QRect &rect) +{ + if (content && content->count()) { + auto tooltipWidget = new FakeToolTip; + tooltipWidget->setLayout(content); + instance()->showInternal(pos, QVariant::fromValue(tooltipWidget), WidgetContent, w, helpId, rect); + } else { + instance()->hideTipWithDelay(); + } +} + void ToolTip::move(const QPoint &pos, QWidget *w) { if (isVisible()) diff --git a/src/libs/utils/tooltip/tooltip.h b/src/libs/utils/tooltip/tooltip.h index 03d4452773..4478281519 100644 --- a/src/libs/utils/tooltip/tooltip.h +++ b/src/libs/utils/tooltip/tooltip.h @@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE class QPoint; class QVariant; +class QLayout; class QWidget; QT_END_NAMESPACE @@ -76,6 +77,8 @@ public: const QString &helpId = QString(), const QRect &rect = QRect()); static void show(const QPoint &pos, QWidget *content, QWidget *w = 0, const QString &helpId = QString(), const QRect &rect = QRect()); + static void show(const QPoint &pos, QLayout *content, QWidget *w = 0, + const QString &helpId = QString(), const QRect &rect = QRect()); static void move(const QPoint &pos, QWidget *w); static void hide(); static void hideImmediately(); diff --git a/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp b/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp index b57b1e7328..2bfa7baac7 100644 --- a/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp +++ b/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp @@ -345,10 +345,7 @@ void ClangDiagnosticManager::addClangTextMarks( const QVector &diagnostics) { for (const ClangBackEnd::DiagnosticContainer &diagnostic : diagnostics) { - auto textMark = new ClangTextMark(filePath(), - diagnostic.location().line(), - diagnostic.severity()); - textMark->setToolTip(diagnostic.text()); + auto textMark = new ClangTextMark(filePath(), diagnostic); m_clangTextMarks.push_back(textMark); m_textDocument->addMark(textMark); } diff --git a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp index a810deb5f9..52c097f305 100644 --- a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp +++ b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp @@ -186,7 +186,7 @@ public: void addChildrenToLayout(const QString &mainFilePath, const QVector::const_iterator first, const QVector::const_iterator last, - QBoxLayout &boxLayout) + QLayout &boxLayout) { for (auto it = first; it != last; ++it) boxLayout.addWidget(createDiagnosticLabel(*it, mainFilePath, IndentDiagnostic)); @@ -194,7 +194,7 @@ void addChildrenToLayout(const QString &mainFilePath, void setupChildDiagnostics(const QString &mainFilePath, const QVector &diagnostics, - QBoxLayout &boxLayout) + QLayout &boxLayout) { if (diagnostics.size() <= 10) { addChildrenToLayout(mainFilePath, diagnostics.begin(), diagnostics.end(), boxLayout); @@ -214,22 +214,13 @@ void setupChildDiagnostics(const QString &mainFilePath, namespace ClangCodeModel { namespace Internal { -ClangDiagnosticToolTipWidget::ClangDiagnosticToolTipWidget( - const QVector &diagnostics, - QWidget *parent) - : Utils::FakeToolTip(parent) +void addToolTipToLayout(const ClangBackEnd::DiagnosticContainer &diagnostic, QLayout *target) { - auto *mainLayout = createLayout(); + // Set up header and text row for main diagnostic + target->addWidget(new MainDiagnosticWidget(diagnostic)); - foreach (const auto &diagnostic, diagnostics) { - // Set up header and text row for main diagnostic - mainLayout->addWidget(new MainDiagnosticWidget(diagnostic)); - - // Set up child rows for notes - setupChildDiagnostics(diagnostic.location().filePath(), diagnostic.children(), *mainLayout); - } - - setLayout(mainLayout); + // Set up child rows for notes + setupChildDiagnostics(diagnostic.location().filePath(), diagnostic.children(), *target); } } // namespace Internal diff --git a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h index 4a6777e384..600ccf22d8 100644 --- a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h +++ b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h @@ -27,19 +27,14 @@ #include -#include +QT_BEGIN_NAMESPACE +class QLayout; +QT_END_NAMESPACE namespace ClangCodeModel { namespace Internal { -class ClangDiagnosticToolTipWidget : public Utils::FakeToolTip -{ - Q_OBJECT -public: - explicit ClangDiagnosticToolTipWidget( - const QVector &diagnostics, - QWidget *parent = 0); -}; +void addToolTipToLayout(const ClangBackEnd::DiagnosticContainer &diagnostic, QLayout *target); } // namespace Internal } // namespace ClangCodeModel diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp index 6428abcc5b..c71e3b9e0d 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp @@ -54,7 +54,6 @@ #include #include -#include #include #include @@ -244,16 +243,12 @@ bool ClangEditorDocumentProcessor::hasDiagnosticsAt(uint line, uint column) cons return m_diagnosticManager.hasDiagnosticsAt(line, column); } -void ClangEditorDocumentProcessor::showDiagnosticTooltip(const QPoint &point, - QWidget *parent, - uint line, - uint column) const +void ClangEditorDocumentProcessor::addDiagnosticToolTipToLayout(uint line, + uint column, + QLayout *target) const { - const QVector diagnostics - = m_diagnosticManager.diagnosticsAt(line, column); - auto *tooltipWidget = new ClangDiagnosticToolTipWidget(diagnostics, parent); - - ::Utils::ToolTip::show(point, tooltipWidget, parent); + foreach (const auto &diagnostic, m_diagnosticManager.diagnosticsAt(line, column)) + addToolTipToLayout(diagnostic, target); } ClangBackEnd::FileContainer ClangEditorDocumentProcessor::fileContainerWithArguments() const diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h index 31c4f5e9a6..e9ec8ebd18 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h @@ -76,10 +76,7 @@ public: extraRefactoringOperations(const TextEditor::AssistInterface &assistInterface) override; bool hasDiagnosticsAt(uint line, uint column) const override; - void showDiagnosticTooltip(const QPoint &point, - QWidget *parent, - uint line, - uint column) const override; + void addDiagnosticToolTipToLayout(uint line, uint column, QLayout *target) const override; ClangBackEnd::FileContainer fileContainerWithArguments() const; diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp index cf5abfb5b6..1021bd0fad 100644 --- a/src/plugins/clangcodemodel/clangtextmark.cpp +++ b/src/plugins/clangcodemodel/clangtextmark.cpp @@ -26,10 +26,12 @@ #include "clangtextmark.h" #include "clangconstants.h" +#include "clangdiagnostictooltipwidget.h" #include #include +#include #include namespace ClangCodeModel { @@ -57,11 +59,13 @@ Core::Id cartegoryForSeverity(ClangBackEnd::DiagnosticSeverity severity) } // anonymous namespace -ClangTextMark::ClangTextMark(const QString &fileName, int lineNumber, ClangBackEnd::DiagnosticSeverity severity) - : TextEditor::TextMark(fileName, lineNumber, cartegoryForSeverity(severity)) + +ClangTextMark::ClangTextMark(const QString &fileName, const ClangBackEnd::DiagnosticContainer &diagnostic) + : TextEditor::TextMark(fileName, int(diagnostic.location().line()), cartegoryForSeverity(diagnostic.severity())), + m_diagnostic(diagnostic) { setPriority(TextEditor::TextMark::HighPriority); - setIcon(severity); + setIcon(diagnostic.severity()); } void ClangTextMark::setIcon(ClangBackEnd::DiagnosticSeverity severity) @@ -79,5 +83,10 @@ void ClangTextMark::setIcon(ClangBackEnd::DiagnosticSeverity severity) TextMark::setIcon(errorIcon); } +void ClangTextMark::addToToolTipLayout(QLayout *target) +{ + Internal::addToolTipToLayout(m_diagnostic, target); +} + } // namespace ClangCodeModel diff --git a/src/plugins/clangcodemodel/clangtextmark.h b/src/plugins/clangcodemodel/clangtextmark.h index 017cec02eb..98833b3854 100644 --- a/src/plugins/clangcodemodel/clangtextmark.h +++ b/src/plugins/clangcodemodel/clangtextmark.h @@ -26,6 +26,7 @@ #pragma once #include +#include #include @@ -34,10 +35,13 @@ namespace ClangCodeModel { class ClangTextMark : public TextEditor::TextMark { public: - ClangTextMark(const QString &fileName, int lineNumber, ClangBackEnd::DiagnosticSeverity severity); + ClangTextMark(const QString &fileName, const ClangBackEnd::DiagnosticContainer &diagnostic); private: + void addToToolTipLayout(QLayout *target); void setIcon(ClangBackEnd::DiagnosticSeverity severity); + + ClangBackEnd::DiagnosticContainer m_diagnostic; }; } // namespace ClangCodeModel diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp index addeb81c75..5b06e062a2 100644 --- a/src/plugins/cppeditor/cpphoverhandler.cpp +++ b/src/plugins/cppeditor/cpphoverhandler.cpp @@ -36,9 +36,11 @@ #include #include +#include #include #include +#include using namespace Core; using namespace TextEditor; @@ -74,8 +76,13 @@ void processWithEditorDocumentProcessor(TextEditorWidget *editorWidget, { if (CppTools::BaseEditorDocumentProcessor *processor = editorDocumentProcessor(editorWidget)) { int line, column; - if (Convenience::convertPosition(editorWidget->document(), position, &line, &column)) - processor->showDiagnosticTooltip(point, editorWidget, line, column); + if (Convenience::convertPosition(editorWidget->document(), position, &line, &column)) { + auto layout = new QVBoxLayout; + layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(2); + processor->addDiagnosticToolTipToLayout(line, column, layout); + Utils::ToolTip::show(point, layout, editorWidget); + } } } diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp index c437bceb80..f32d79ed77 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.cpp +++ b/src/plugins/cpptools/baseeditordocumentprocessor.cpp @@ -63,7 +63,7 @@ bool BaseEditorDocumentProcessor::hasDiagnosticsAt(uint, uint) const return false; } -void BaseEditorDocumentProcessor::showDiagnosticTooltip(const QPoint &, QWidget *, uint, uint) const +void BaseEditorDocumentProcessor::addDiagnosticToolTipToLayout(uint, uint, QLayout *) const { } diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h index 844cadc64c..77723fcd4c 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.h +++ b/src/plugins/cpptools/baseeditordocumentprocessor.h @@ -65,10 +65,7 @@ public: extraRefactoringOperations(const TextEditor::AssistInterface &assistInterface); virtual bool hasDiagnosticsAt(uint line, uint column) const; - virtual void showDiagnosticTooltip(const QPoint &point, - QWidget *parent, - uint line, - uint column) const; + virtual void addDiagnosticToolTipToLayout(uint line, uint column, QLayout *layout) const; signals: // Signal interface to implement diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index d0a4209083..d7b75672dd 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -111,6 +111,7 @@ #include #include #include +#include //#define DO_FOO @@ -5048,6 +5049,7 @@ void TextEditorWidget::showDefaultContextMenu(QContextMenuEvent *e, Id menuConte void TextEditorWidget::extraAreaLeaveEvent(QEvent *) { d->extraAreaPreviousMarkTooltipRequestedLine = -1; + ToolTip::hide(); // fake missing mouse move event from Qt QMouseEvent me(QEvent::MouseMove, QPoint(-1, -1), Qt::NoButton, 0, 0); @@ -5108,13 +5110,16 @@ void TextEditorWidget::extraAreaMouseEvent(QMouseEvent *e) int line = cursor.blockNumber() + 1; if (d->extraAreaPreviousMarkTooltipRequestedLine != line) { if (auto data = static_cast(cursor.block().userData())) { - QStringList toolTips; - foreach (TextMark *mark, data->marks()) { - QString toolTip = mark->toolTip(); - if (!toolTip.isEmpty()) - toolTips.append(toolTip); + if (data->marks().isEmpty()) { + ToolTip::hide(); + } else { + auto layout = new QVBoxLayout; + layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(2); + foreach (TextMark *mark, data->marks()) + mark->addToToolTipLayout(layout); + ToolTip::show(mapToGlobal(e->pos()), layout, this); } - ToolTip::show(mapToGlobal(e->pos()), toolTips.join('\n'), this); } } d->extraAreaPreviousMarkTooltipRequestedLine = line; diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp index 5f879e8760..26f16b1b39 100644 --- a/src/plugins/texteditor/textmark.cpp +++ b/src/plugins/texteditor/textmark.cpp @@ -33,6 +33,8 @@ #include #include +#include + using namespace Core; using namespace Utils; using namespace TextEditor::Internal; @@ -188,6 +190,12 @@ void TextMark::dragToLine(int lineNumber) Q_UNUSED(lineNumber); } +void TextMark::addToToolTipLayout(QLayout *target) +{ + if (!m_toolTip.isEmpty()) + target->addWidget(new QLabel(m_toolTip)); +} + TextDocument *TextMark::baseTextDocument() const { return m_baseTextDocument; diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h index a7585e379d..bdbf799e74 100644 --- a/src/plugins/texteditor/textmark.h +++ b/src/plugins/texteditor/textmark.h @@ -33,6 +33,7 @@ #include QT_BEGIN_NAMESPACE +class QLayout; class QPainter; class QRect; class QTextBlock; @@ -73,6 +74,7 @@ public: virtual void clicked(); virtual bool isDraggable() const; virtual void dragToLine(int lineNumber); + virtual void addToToolTipLayout(QLayout *target); static Utils::Theme::Color categoryColor(Core::Id category); static bool categoryHasColor(Core::Id category); -- cgit v1.2.1 From 65f0b4b1c8d1082347b1bd52e6224a09f79c8ca6 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 25 Jul 2016 16:10:13 +0200 Subject: QmlDesigner: Theme binding text field The text field for bindings was not properly themed, yet. We also use general Qt Creator icons for apply and cancel. Change-Id: I45f1220540a6eaeff05be0b99d8b70b64ca67af4 Reviewed-by: Thomas Hartmann --- .../HelperWidgets/ExtendedFunctionButton.qml | 94 ++++++++++++--------- .../HelperWidgets/images/apply.png | Bin 514 -> 0 bytes .../HelperWidgets/images/cancel.png | Bin 576 -> 0 bytes .../componentcore/qmldesignericonprovider.cpp | 6 ++ 4 files changed, 62 insertions(+), 38 deletions(-) delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/apply.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/cancel.png diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml index 0e795d190b..a3d14a710e 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml @@ -128,16 +128,7 @@ Item { Rectangle { parent: itemPane visible: false - x: 10 - color: "#424242" - - radius: 3 - border.color: "black" - gradient: Gradient { - GradientStop {color: "#2c2c2c" ; position: 0} - GradientStop {color: "#343434" ; position: 0.15} - GradientStop {color: "#373737" ; position: 1.0} - } + x: 6 id: expressionDialog @@ -146,9 +137,14 @@ Item { y = pos.y + 2; } - width: parent.width - 20 + width: parent.width - 12 height: 120 + radius: 2 + color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate + //border.color: creatorTheme.QmlDesignerBackgroundColorDarker + border.color: creatorTheme.QmlDesignerTabLight + Controls.TextField { id: textField anchors.fill: parent @@ -162,20 +158,16 @@ Item { } style: TextFieldStyle { - textColor: Constants.colorsDefaultText + textColor: creatorTheme.PanelTextColorLight padding.top: 3 padding.bottom: 1 padding.left: 16 - placeholderTextColor: "gray" + placeholderTextColor: creatorTheme.PanelTextColorMid background: Rectangle { implicitWidth: 100 implicitHeight: 23 - radius: 3 - gradient: Gradient { - GradientStop {color: "#2c2c2c" ; position: 0} - GradientStop {color: "#343434" ; position: 0.15} - GradientStop {color: "#373737" ; position: 1.0} - } + radius: 2 + color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate } } } @@ -183,16 +175,29 @@ Item { Row { spacing: 0 Button { + width: 16 + height: 16 style: ButtonStyle { - background: Image { - source: "images/apply.png" - Rectangle { - opacity: control.pressed ? 0.5 : 0 - anchors.fill: parent - gradient: Gradient { - GradientStop {color: "#606060" ; position: 0} - GradientStop {color: "#404040" ; position: 0.07} - GradientStop {color: "#303030" ; position: 1} + background: Item{ + Image { + width: 16 + height: 16 + source: "image://icons/error" + opacity: { + if (control.pressed) + return 0.5; + + if (control.hovered) + return 1.0; + + return 0.9; + } + Rectangle { + z: -1 + anchors.fill: parent + color: control.hovered? creatorTheme.FancyToolButtonSelectedColor : creatorTheme.BackgroundColorDark + border.color: creatorTheme.QmlDesignerBackgroundColorDarker + radius: 2 } } } @@ -203,17 +208,29 @@ Item { } } Button { + width: 16 + height: 16 style: ButtonStyle { - background: Image { - source: "images/cancel.png" - - Rectangle { - opacity: control.pressed ? 0.5 : 0 - anchors.fill: parent - gradient: Gradient { - GradientStop {color: "#606060" ; position: 0} - GradientStop {color: "#404040" ; position: 0.07} - GradientStop {color: "#303030" ; position: 1} + background: Item { + Image { + width: 16 + height: 16 + source: "image://icons/ok" + opacity: { + if (control.pressed) + return 0.5; + + if (control.hovered) + return 1.0; + + return 0.9; + } + Rectangle { + z: -1 + anchors.fill: parent + color: control.hovered? creatorTheme.FancyToolButtonSelectedColor : creatorTheme.BackgroundColorDark + border.color: creatorTheme.QmlDesignerBackgroundColorDarker + radius: 2 } } } @@ -224,6 +241,7 @@ Item { } anchors.right: parent.right anchors.bottom: parent.bottom + anchors.margins: 2 } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/apply.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/apply.png deleted file mode 100644 index 049398256b..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/apply.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/cancel.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/cancel.png deleted file mode 100644 index 0f2a8b1194..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/cancel.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index 053bf1c240..8b604a4e9f 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -78,6 +78,12 @@ QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, c else if (id == "tr") result = Icon({ { ":/qmldesigner/images/tr.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "ok") + result = Icon({ + { ":/utils/images/ok.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "error") + result = Icon({ + { ":/utils/images/error.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else qWarning() << Q_FUNC_INFO << "Image not found:" << id; -- cgit v1.2.1 From dc8fcdf028f9fd1bcff17a215977090ed41df790 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 25 Jul 2016 16:38:19 +0200 Subject: Doc: Fix To-Do Entries output pane name in docs Change-Id: Id03b410653be4ae75f6a98ea7af045ac35575ce8 Reviewed-by: Friedemann Kleint --- doc/src/howto/creator-ui.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc index 30d8b1cd3e..6b1e038333 100644 --- a/doc/src/howto/creator-ui.qdoc +++ b/doc/src/howto/creator-ui.qdoc @@ -486,9 +486,9 @@ You can change the property values permanently in the code editor. - \section2 To-Do List + \section2 To-Do Entries - The \uicontrol {To-Do List Entries} pane lists the BUG, FIXME, NOTE, TODO, and + The \uicontrol {To-Do Entries} pane lists the BUG, FIXME, NOTE, TODO, and WARNING keywords from the current file or from all project files. The keywords are organized into information, warning, and error categories. -- cgit v1.2.1 From ce36804665c00bf9b74f9f8f299becaa4f2f4baa Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 25 Jul 2016 16:46:47 +0200 Subject: QmlDesigner: New anchor icons Themable and High-DPI Change-Id: Ic073a6a8c5f3fc7eb28b9b498d3dddbebedb243c Reviewed-by: Thomas Hartmann --- .../HelperWidgets/AnchorButtons.qml | 14 +- .../HelperWidgets/ButtonRowButton.qml | 8 +- .../HelperWidgets/IconLabel.qml | 2 +- .../HelperWidgets/images/anchor-bottom.png | Bin 308 -> 0 bytes .../HelperWidgets/images/anchor-fill.png | Bin 255 -> 0 bytes .../HelperWidgets/images/anchor-horizontal.png | Bin 423 -> 0 bytes .../HelperWidgets/images/anchor-left.png | Bin 221 -> 0 bytes .../HelperWidgets/images/anchor-right.png | Bin 220 -> 0 bytes .../HelperWidgets/images/anchor-top.png | Bin 276 -> 0 bytes .../HelperWidgets/images/anchor-vertical.png | Bin 230 -> 0 bytes .../propertyEditorQmlSources/QtQuick/AnchorRow.qml | 6 +- .../QtQuick/LayoutSection.qml | 12 +- src/libs/qmleditorwidgets/images/anchor_bottom.png | Bin 0 -> 91 bytes .../qmleditorwidgets/images/anchor_bottom@2x.png | Bin 0 -> 95 bytes src/libs/qmleditorwidgets/images/anchor_fill.png | Bin 0 -> 196 bytes .../qmleditorwidgets/images/anchor_fill@2x.png | Bin 0 -> 226 bytes .../qmleditorwidgets/images/anchor_horizontal.png | Bin 0 -> 93 bytes .../images/anchor_horizontal@2x.png | Bin 0 -> 95 bytes src/libs/qmleditorwidgets/images/anchor_left.png | Bin 0 -> 93 bytes .../qmleditorwidgets/images/anchor_left@2x.png | Bin 0 -> 95 bytes src/libs/qmleditorwidgets/images/anchor_right.png | Bin 0 -> 93 bytes .../qmleditorwidgets/images/anchor_right@2x.png | Bin 0 -> 95 bytes src/libs/qmleditorwidgets/images/anchor_top.png | Bin 0 -> 93 bytes src/libs/qmleditorwidgets/images/anchor_top@2x.png | Bin 0 -> 99 bytes .../qmleditorwidgets/images/anchor_vertical.png | Bin 0 -> 93 bytes .../qmleditorwidgets/images/anchor_vertical@2x.png | Bin 0 -> 98 bytes src/libs/qmleditorwidgets/images/anchoreditem.png | Bin 0 -> 141 bytes .../qmleditorwidgets/images/anchoreditem@2x.png | Bin 0 -> 186 bytes src/libs/qmleditorwidgets/resources.qrc | 16 ++ .../componentcore/qmldesignericonprovider.cpp | 27 +++ src/tools/icons/qtcreatoricons.svg | 205 ++++++++++++++++++++- 31 files changed, 268 insertions(+), 22 deletions(-) delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-bottom.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-fill.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-horizontal.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-left.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-right.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-top.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-vertical.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_bottom.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_bottom@2x.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_fill.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_fill@2x.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_horizontal.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_horizontal@2x.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_left.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_left@2x.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_right.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_right@2x.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_top.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_top@2x.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_vertical.png create mode 100644 src/libs/qmleditorwidgets/images/anchor_vertical@2x.png create mode 100644 src/libs/qmleditorwidgets/images/anchoreditem.png create mode 100644 src/libs/qmleditorwidgets/images/anchoreditem@2x.png diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml index 58e8df834d..e7f9859ee4 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml @@ -33,7 +33,7 @@ ButtonRow { id: buttonRow ButtonRowButton { - iconSource: "images/anchor-top.png" + iconSource: "image://icons/anchor-top" tooltip: qsTr("Anchor item to the top.") property bool topAnchored: anchorBackend.topAnchored @@ -53,7 +53,7 @@ ButtonRow { } ButtonRowButton { - iconSource: "images/anchor-bottom.png" + iconSource: "image://icons/anchor-bottom" tooltip: qsTr("Anchor item to the bottom.") property bool bottomAnchored: anchorBackend.bottomAnchored @@ -74,7 +74,7 @@ ButtonRow { } ButtonRowButton { - iconSource: "images/anchor-left.png" + iconSource: "image://icons/anchor-left" tooltip: qsTr("Anchor item to the left.") property bool leftAnchored: anchorBackend.leftAnchored @@ -94,7 +94,7 @@ ButtonRow { } ButtonRowButton { - iconSource: "images/anchor-right.png" + iconSource: "image://icons/anchor-right" tooltip: qsTr("Anchor item to the right.") property bool rightAnchored: anchorBackend.rightAnchored @@ -119,7 +119,7 @@ ButtonRow { ButtonRowButton { - iconSource: "images/anchor-fill.png" + iconSource: "image://icons/anchor-fill" tooltip: qsTr("Fill parent item.") property bool isFilled: anchorBackend.isFilled @@ -141,7 +141,7 @@ ButtonRow { } ButtonRowButton { - iconSource: "images/anchor-vertical.png" + iconSource: "image://icons/anchor-vertical" tooltip: qsTr("Anchor item vertically.") property bool verticalCentered: anchorBackend.verticalCentered; @@ -163,7 +163,7 @@ ButtonRow { } ButtonRowButton { - iconSource: "images/anchor-horizontal.png" + iconSource: "image://icons/anchor-horizontal" tooltip: qsTr("Anchor item horizontally.") property bool horizontalCentered: anchorBackend.horizontalCentered; diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml index 794cdd0053..61975a6946 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml @@ -69,7 +69,7 @@ Item { anchors.fill: parent visible: checked - color: creatorTheme.QmlDesignerBackgroundColorDarker + color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate } RoundedPanel { @@ -78,15 +78,15 @@ Item { anchors.fill: parent visible: !checked - color: creatorTheme.BackgroundColorDark + color: creatorTheme.QmlDesignerBackgroundColorDarker } } Image { id: image - //source: iconSource + width: 16 + height: 16 anchors.centerIn: parent - anchors.leftMargin: leftPadding } ToolTipArea { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/IconLabel.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/IconLabel.qml index 50bdd33965..9306539a3b 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/IconLabel.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/IconLabel.qml @@ -38,7 +38,7 @@ Item { height: 16 Image { id: image - anchors.centerIn: parent + anchors.fill: parent } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-bottom.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-bottom.png deleted file mode 100644 index e3fe210293..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-bottom.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-fill.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-fill.png deleted file mode 100644 index 5416866937..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-fill.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-horizontal.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-horizontal.png deleted file mode 100644 index 8a9075a676..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-horizontal.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-left.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-left.png deleted file mode 100644 index 3d3df4048c..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-left.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-right.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-right.png deleted file mode 100644 index b0a20b110b..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-right.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-top.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-top.png deleted file mode 100644 index 4220e37a2d..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-top.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-vertical.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-vertical.png deleted file mode 100644 index eedb058608..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/anchor-vertical.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml index 75e815098c..2e2446a03b 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml @@ -128,7 +128,7 @@ RowLayout { exclusive: true ButtonRowButton { - iconSource: verticalAnchor ? "../HelperWidgets/images/anchor-top.png" : "../HelperWidgets/images/anchor-left.png" + iconSource: "image://icons/anchor-" + (verticalAnchor ? "top" : "left") tooltip: verticalAnchor ? qsTr("Anchor to the top of the target.") : qsTr("Anchor to the left of the target.") onClicked: { if (!invertRelativeTargets) @@ -139,14 +139,14 @@ RowLayout { } ButtonRowButton { - iconSource: verticalAnchor ? "../HelperWidgets/images/anchor-vertical.png" : "../HelperWidgets/images/anchor-horizontal.png" + iconSource: "image://icons/anchor-" + (verticalAnchor ? "vertical" : "horizontal") tooltip: verticalAnchor ? qsTr("Anchor to the vertical center of the target.") : qsTr("Anchor to the horizontal center of the target.") onClicked: centerButtonClicked(); } ButtonRowButton { - iconSource: verticalAnchor ? "../HelperWidgets/images/anchor-bottom.png" : "../HelperWidgets/images/anchor-right.png" + iconSource: "image://icons/anchor-" + (verticalAnchor ? "bottom" : "right") tooltip: verticalAnchor ? qsTr("Anchor to the bottom of the target.") : qsTr("Anchor to the right of the target.") onClicked: { if (!invertRelativeTargets) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LayoutSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LayoutSection.qml index 6ae989f67e..f211a4b37f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LayoutSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LayoutSection.qml @@ -50,7 +50,7 @@ Section { AnchorRow { visible: anchorBackend.topAnchored; - iconSource: "../HelperWidgets/images/anchor-top.png" + iconSource: "image://icons/anchor-top" anchorMargin: backendValues.anchors_topMargin targetName: anchorBackend.topTarget onTargetChanged: { @@ -73,7 +73,7 @@ Section { AnchorRow { visible: anchorBackend.bottomAnchored; - iconSource: "../HelperWidgets/images/anchor-bottom.png" + iconSource: "image://icons/anchor-bottom" anchorMargin: backendValues.anchors_bottomMargin targetName: anchorBackend.bottomTarget onTargetChanged: { @@ -97,7 +97,7 @@ Section { AnchorRow { visible: anchorBackend.leftAnchored; - iconSource: "../HelperWidgets/images/anchor-left.png" + iconSource: "image://icons/anchor-left" anchorMargin: backendValues.anchors_leftMargin targetName: anchorBackend.leftTarget onTargetChanged: { @@ -120,7 +120,7 @@ Section { AnchorRow { visible: anchorBackend.rightAnchored; - iconSource: "../HelperWidgets/images/anchor-right.png" + iconSource: "image://icons/anchor-right" anchorMargin: backendValues.anchors_rightMargin targetName: anchorBackend.rightTarget onTargetChanged: { @@ -145,7 +145,7 @@ Section { AnchorRow { showAlternativeTargets: false visible: anchorBackend.horizontalCentered; - iconSource: "../HelperWidgets/images/anchor-horizontal.png" + iconSource: "image://icons/anchor-horizontal" anchorMargin: backendValues.anchors_horizontalCenterOffset targetName: anchorBackend.horizontalTarget onTargetChanged: { @@ -158,7 +158,7 @@ Section { AnchorRow { showAlternativeTargets: false visible: anchorBackend.verticalCentered; - iconSource: "../HelperWidgets/images/anchor-vertical.png" + iconSource: "image://icons/anchor-vertical" anchorMargin: backendValues.anchors_verticalCenterOffset targetName: anchorBackend.verticalTarget onTargetChanged: { diff --git a/src/libs/qmleditorwidgets/images/anchor_bottom.png b/src/libs/qmleditorwidgets/images/anchor_bottom.png new file mode 100644 index 0000000000..fba3a6c836 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_bottom.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_bottom@2x.png b/src/libs/qmleditorwidgets/images/anchor_bottom@2x.png new file mode 100644 index 0000000000..4179d20e1d Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_bottom@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_fill.png b/src/libs/qmleditorwidgets/images/anchor_fill.png new file mode 100644 index 0000000000..7109ee5e54 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_fill.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_fill@2x.png b/src/libs/qmleditorwidgets/images/anchor_fill@2x.png new file mode 100644 index 0000000000..54c498fdca Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_fill@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_horizontal.png b/src/libs/qmleditorwidgets/images/anchor_horizontal.png new file mode 100644 index 0000000000..851d7896dc Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_horizontal.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_horizontal@2x.png b/src/libs/qmleditorwidgets/images/anchor_horizontal@2x.png new file mode 100644 index 0000000000..fec1461b01 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_horizontal@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_left.png b/src/libs/qmleditorwidgets/images/anchor_left.png new file mode 100644 index 0000000000..0e5ec07b57 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_left.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_left@2x.png b/src/libs/qmleditorwidgets/images/anchor_left@2x.png new file mode 100644 index 0000000000..adab9b03fe Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_left@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_right.png b/src/libs/qmleditorwidgets/images/anchor_right.png new file mode 100644 index 0000000000..97f9a70469 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_right.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_right@2x.png b/src/libs/qmleditorwidgets/images/anchor_right@2x.png new file mode 100644 index 0000000000..583b3df22b Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_right@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_top.png b/src/libs/qmleditorwidgets/images/anchor_top.png new file mode 100644 index 0000000000..37b0fcadc9 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_top.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_top@2x.png b/src/libs/qmleditorwidgets/images/anchor_top@2x.png new file mode 100644 index 0000000000..3253a42bcc Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_top@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_vertical.png b/src/libs/qmleditorwidgets/images/anchor_vertical.png new file mode 100644 index 0000000000..3c092755f3 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_vertical.png differ diff --git a/src/libs/qmleditorwidgets/images/anchor_vertical@2x.png b/src/libs/qmleditorwidgets/images/anchor_vertical@2x.png new file mode 100644 index 0000000000..ed661f1a72 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchor_vertical@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/anchoreditem.png b/src/libs/qmleditorwidgets/images/anchoreditem.png new file mode 100644 index 0000000000..5293d5e9b1 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchoreditem.png differ diff --git a/src/libs/qmleditorwidgets/images/anchoreditem@2x.png b/src/libs/qmleditorwidgets/images/anchoreditem@2x.png new file mode 100644 index 0000000000..ded9e69bd4 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/anchoreditem@2x.png differ diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index f43e57dd28..c7c41667dd 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -39,5 +39,21 @@ images/tile-icon-hor-crop.png images/tile-icon-hor - scale.png images/tile-icon-vert-scale.png + images/anchor_bottom.png + images/anchor_bottom@2x.png + images/anchor_fill.png + images/anchor_fill@2x.png + images/anchor_horizontal.png + images/anchor_horizontal@2x.png + images/anchor_left.png + images/anchor_left@2x.png + images/anchor_right.png + images/anchor_right@2x.png + images/anchor_top.png + images/anchor_top@2x.png + images/anchor_vertical.png + images/anchor_vertical@2x.png + images/anchoreditem.png + images/anchoreditem@2x.png diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index 8b604a4e9f..9693d5f1f5 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -84,6 +84,33 @@ QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, c else if (id == "error") result = Icon({ { ":/utils/images/error.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "anchor-top") + result = Icon({ + { ":/qmldesigner/images/anchor_top.png", Theme::IconsBaseColor}, + { ":/qmldesigner/images/anchoreditem.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "anchor-right") + result = Icon({ + { ":/qmldesigner/images/anchor_right.png", Theme::IconsBaseColor}, + { ":/qmldesigner/images/anchoreditem.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "anchor-bottom") + result = Icon({ + { ":/qmldesigner/images/anchor_bottom.png", Theme::IconsBaseColor}, + { ":/qmldesigner/images/anchoreditem.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "anchor-left") + result = Icon({ + { ":/qmldesigner/images/anchor_left.png", Theme::IconsBaseColor}, + { ":/qmldesigner/images/anchoreditem.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "anchor-horizontal") + result = Icon({ + { ":/qmldesigner/images/anchor_horizontal.png", Theme::IconsBaseColor}, + { ":/qmldesigner/images/anchoreditem.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "anchor-vertical") + result = Icon({ + { ":/qmldesigner/images/anchor_vertical.png", Theme::IconsBaseColor}, + { ":/qmldesigner/images/anchoreditem.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "anchor-fill") + result = Icon({ + { ":/qmldesigner/images/anchor_fill.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else qWarning() << Q_FUNC_INFO << "Image not found:" << id; diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index a757070432..9e9bf7deb6 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -909,7 +909,28 @@ inkscape:groupmode="layer" id="layer6" inkscape:label="Tools logos" - style="display:inline" /> + style="display:inline"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Mon, 25 Jul 2016 17:57:55 +0200 Subject: QmlDesigner: Fix formeditor selection indicatoor on HighDPI Make it a real reactangle, without worn-out corners. Change-Id: If7cce94896a485d34ae23602bb1dc7437cf1c62c Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp index 9dbf66d883..b2b7457149 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp @@ -91,6 +91,7 @@ void SelectionIndicator::setItems(const QList &itemList) newSelectionIndicatorGraphicsItem->setFlag(QGraphicsItem::ItemIsSelectable, false); QPen pen; + pen.setJoinStyle(Qt::MiterJoin); pen.setColor(QColor(108, 141, 221)); newSelectionIndicatorGraphicsItem->setPen(pen); newSelectionIndicatorGraphicsItem->setCursor(m_cursor); -- cgit v1.2.1 From 8f36a772edfc27e32359cfe38d108f5069479477 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 25 Jul 2016 17:18:17 +0200 Subject: QmlDesigner: Use theme text color for TargetComboBox Change-Id: I9c9b8286c226973f1c5008d807e4e3d452a76229 Reviewed-by: Alessandro Portale --- .../qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml index f9e1d204dd..f96b6304e5 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml @@ -31,6 +31,7 @@ import QtQuick.Controls 1.0 as Controls Controls.ComboBox { property string targetName: anchorBackend.topTarget + property color textColor: creatorTheme.PanelTextColorLight id: targetComboBox @@ -50,5 +51,6 @@ Controls.ComboBox { model: anchorBackend.possibleTargetItems style: CustomComboBoxStyle { + textColor: targetComboBox.textColor } } -- cgit v1.2.1 From e28724d16d92c69e66c16d3a673d31fd60dddc9f Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 25 Jul 2016 18:39:03 +0200 Subject: QmlDesigner: Theming fix for font size The color of the combobox was not defined by the theme. Change-Id: Iae9487f6c80e07c0c7b0155db79d9125c082c33f Reviewed-by: Alessandro Portale --- .../qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml index 911b93271c..56c5977080 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml @@ -113,6 +113,7 @@ Section { Controls.ComboBox { id: sizeType model: ["pixels", "points"] + property color textColor: creatorTheme.PanelTextColorLight onCurrentIndexChanged: { if (sizeWidget.isSetup) return; -- cgit v1.2.1 From a831391337e9b80a23f2bb10a2a6a72ab6a91da5 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 25 Jul 2016 18:40:07 +0200 Subject: QmlDesigner: Fix transparent color issue for font size We use z instead of visible, because visible triggered issues in the layout engine. I use both for now. It seems to work with recent Qt versions. Change-Id: I74fc1eac6d8443a85683c208ccf99b5d3f0eee09 Reviewed-by: Alessandro Portale --- .../propertyEditorQmlSources/HelperWidgets/FontSection.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml index 56c5977080..e74c5c329a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml @@ -95,7 +95,7 @@ Section { SpinBox { id: sizeSpinBox minimumValue: 0 - //visible: !sizeWidget.pixelSize + visible: !sizeWidget.pixelSize z: !sizeWidget.pixelSize ? 1 : 0 maximumValue: 400 backendValue: pointSize @@ -103,7 +103,7 @@ Section { SpinBox { minimumValue: 0 - //visible: sizeWidget.pixelSize + visible: sizeWidget.pixelSize z: sizeWidget.pixelSize ? 1 : 0 maximumValue: 400 backendValue: pixelSize -- cgit v1.2.1 From 938ca5ca9e72fa24130d9ca4b7dd67004b522f0c Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 26 Jul 2016 07:20:43 +0200 Subject: AutoTest: Fix enabled state of run buttons Disable running tests also when currently executing a test run. Change-Id: Ic9538678d678650c3c79da5699f96e812d7c5415 Reviewed-by: Oliver Wolff --- src/plugins/autotest/testresultspane.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index 3571e6c34a..05168391af 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -517,7 +517,7 @@ void TestResultsPane::updateRunActions() { QString whyNot; TestTreeModel *model = TestTreeModel::instance(); - const bool enable = !model->parser()->isParsing() && model->hasTests() + const bool enable = !m_testRunning && !model->parser()->isParsing() && model->hasTests() && ProjectExplorer::ProjectExplorerPlugin::canRunStartupProject( ProjectExplorer::Constants::NORMAL_RUN_MODE, &whyNot); m_runAll->setEnabled(enable); -- cgit v1.2.1 From 16c007a0544870c191bd56c655739a0d03e011f8 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 26 Jul 2016 07:33:37 +0200 Subject: AutoTest: Fix stopping test run when debugging tests Change-Id: I19dcbd89b68e4df5d87cb6b6923adee0d07a6b55 Reviewed-by: Oliver Wolff --- src/plugins/autotest/testrunner.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 4728620536..a85bc750de 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -323,6 +323,7 @@ void TestRunner::debugTests() return; } + connect(this, &TestRunner::requestStopTestRun, runControl, &Debugger::DebuggerRunControl::stop); connect(runControl, &Debugger::DebuggerRunControl::finished, this, &TestRunner::onFinished); ProjectExplorer::ProjectExplorerPlugin::startRunControl( runControl, ProjectExplorer::Constants::DEBUG_RUN_MODE); -- cgit v1.2.1 From 0651eddbad7e9fa6f8b068f644ca9fe92273e23e Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 25 Jul 2016 15:42:49 +0200 Subject: Clang: Stop needless completion detail calculation ...on the plugin side by removing a left over calculation. We construct the detail in the virtual ClangAssistProposalItem::detail(), that is, on demand. Test: 1. Open src/plugins/clangstaticanalyzer/unit-tests/qt-essential-includes.pro 2. Open main.cpp 3. Complete in the main function Measured with a timer in IpcReceiver::codeCompleted. On Linux, for 20637 completion items: Before: 119ms (avg) Now: 81ms (avg) Gain: 32% Change-Id: I9617cb9651a8367c31cd40e965175b5b37e10730 Reviewed-by: Tim Jenssen Reviewed-by: Alessandro Portale --- src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index 5955d351f0..0fde4dd276 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -91,8 +91,6 @@ QList toAssistProposalItems(const CodeCompletions item->addOverload(codeCompletion); } else { item = new ClangAssistProposalItem; - QString detail = CompletionChunksToTextConverter::convertToToolTipWithHtml(codeCompletion.chunks()); - items.insert(name, item); item->setText(name); -- cgit v1.2.1 From add9e627b82687c43b984519bcc1e9c95fa7e8a5 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 25 Jul 2016 16:54:51 +0200 Subject: Debugger: Don't access unloaded perspectives This can happen if a previous session marked a plugin for not loading and ended the session in a perspective provided by that plugin. Change-Id: I83a5dda421a1bb8ed2f8942f03e629e9c5d4d4ed Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggermainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index d3d5ceb3f8..7821532832 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -265,7 +265,7 @@ void DebuggerMainWindow::loadPerspectiveHelper(const QByteArray &perspectiveId, ICore::removeAdditionalContext(Context(Id::fromName(m_currentPerspectiveId))); const Perspective *perspective = m_perspectiveForPerspectiveId.value(m_currentPerspectiveId); - QWidget *central = perspective->centralWidget(); + QWidget *central = perspective ? perspective->centralWidget() : nullptr; m_centralWidgetStack->removeWidget(central ? central : m_editorPlaceHolder); } -- cgit v1.2.1 From a8fce64f3562be1091af6b789d83a1bb6e590995 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 26 Jul 2016 09:35:38 +0200 Subject: Doc: Fix link broken by a section title change To-Do List > To-Do Entries to match the output pane title. Change-Id: Ia37ff8a49b91a1db5773a0bd37f80b87ad1c8049 Reviewed-by: Leena Miettinen --- doc/src/projects/creator-projects-settings-overview.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc index 82d6ccc8d0..24dc57d081 100644 --- a/doc/src/projects/creator-projects-settings-overview.qdoc +++ b/doc/src/projects/creator-projects-settings-overview.qdoc @@ -97,7 +97,7 @@ \li \l{Using Clang Static Analyzer}{Clang Static Analyzer} - \li \l{To-Do List}{To-Do} (experimental) + \li \l{To-Do Entries}{To-Do} (experimental) \endlist -- cgit v1.2.1 From 4afb97f1af84938f613a28d08f8b28059a73d6dc Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 26 Jul 2016 10:25:25 +0200 Subject: QmlDesigner: Fix a typo in a property editor label Change-Id: I1b1cd8f402d379fc6db023ba1225757a7ca1099f Reviewed-by: Thomas Hartmann --- .../propertyEditorQmlSources/HelperWidgets/FlickableSection.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml index b172785ecd..7a90e89413 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml @@ -51,7 +51,7 @@ Section { } Label { - text: "W" + text: "H" width: 12 } -- cgit v1.2.1 From dd3fa3021201ef9805359e102fa664893c662fab Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 26 Jul 2016 08:21:37 +0200 Subject: QmlProfiler: The local runner can spontaneously stop an application If the application outputs the "QML debugging is disabled" line (and Qt Creator can read it), the QmlProfilerRunControl will kill the application. In the test this happens if Qt Creator was compiled without QML debugging enabled. Change-Id: I958a991d304ec9af8643e88dd9709f580a28753f Reviewed-by: Christian Kandeler --- src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp b/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp index 34d5aacdd1..d6785f5f9b 100644 --- a/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp +++ b/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp @@ -105,9 +105,6 @@ void LocalQmlProfilerRunnerTest::testRunner() rc->start(); QTRY_COMPARE_WITH_TIMEOUT(runCount, 3, 10000); - QTest::qWait(1000); - QVERIFY(running); // verify it doesn't spontaneously stop - rc->stop(); QTRY_VERIFY_WITH_TIMEOUT(!running, 10000); -- cgit v1.2.1 From 9f3eaaf5e2e20502dcec9b8df984bf775c778f73 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 25 Jul 2016 18:50:13 +0200 Subject: Squish: Use shadow builds in tst_simple_analyze So MSVC2010 and MSVC2013 don't get in their way. Change-Id: Ie4696ce1afa695a6db109945ab506ce195322656 Reviewed-by: Christian Stenger --- tests/system/suite_debugger/tst_simple_analyze/test.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py index 53535e3490..e1fcfecd39 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/test.py +++ b/tests/system/suite_debugger/tst_simple_analyze/test.py @@ -65,7 +65,7 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): # switching from MSVC to MinGW build will fail on the clean step of 'Rebuild All' because # of differences between MSVC's and MinGW's Makefile (so clean before switching kits) invokeMenuItem('Build', 'Clean Project "%s"' % projectName) - qtVersion = verifyBuildConfig(targetCount, kit, config, True, enableQmlDebug=True)[0] + qtVersion = verifyBuildConfig(targetCount, kit, config, True, True, True)[0] test.log("Selected kit using Qt %s" % qtVersion) # explicitly build before start debugging for adding the executable as allowed program to WinFW invokeMenuItem("Build", "Rebuild All") @@ -73,7 +73,13 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): if not checkCompile(): test.fatal("Compile had errors... Skipping current build config") continue - allowAppThroughWinFW(workingDir, projectName, False) + if platform.system() in ('Microsoft' 'Windows'): + switchViewTo(ViewConstants.PROJECTS) + switchToBuildOrRunSettingsFor(targetCount, kit, ProjectSettings.BUILD) + buildDir = os.path.join(str(waitForObject(":Qt Creator_Utils::BuildDirectoryLineEdit").text), + "debug") + switchViewTo(ViewConstants.EDIT) + allowAppThroughWinFW(buildDir, projectName, None) switchViewTo(ViewConstants.DEBUG) selectFromCombo(":Analyzer Toolbar.AnalyzerManagerToolBox_QComboBox", "QML Profiler") recordButton = waitForObject("{container=':DebugModeWidget.Toolbar_QDockWidget' " @@ -123,7 +129,8 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): elif str(model.index(row, colCalls).data()) == "2": test.compare(model.index(row, colMedian).data(), model.index(row, colLongest).data(), "For two calls, median and longest time must be the same.") - deleteAppFromWinFW(workingDir, projectName, False) + if platform.system() in ('Microsoft' 'Windows'): + deleteAppFromWinFW(buildDir, projectName, None) progressBarWait(15000, False) # wait for "Build" progressbar to disappear clickButton(waitForObject(":Analyzer Toolbar.Clear_QToolButton")) test.verify(waitFor("model.rowCount() == 0", 3000), "Analyzer results cleared.") -- cgit v1.2.1 From 980fd1b2195125561ddfc881e2ccc4d0cbf52d7b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Jul 2016 11:07:58 +0200 Subject: QmlDesigner: Avoiding possible regression We have a case of a crashing puppet, that might be related to QML2_IMPORT_PATH. Since this only affects packages and we only see the issue on a non developer machine, we just go back to the old behavior for now. Change-Id: I322cb5b02ff3b5a3dc27bab4767e6488686d216f Reviewed-by: Alessandro Portale --- src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index e4d5d724f3..7acc8f114d 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -379,7 +379,8 @@ QProcessEnvironment PuppetCreator::processEnvironment() const QStringList importPaths = m_model->importPaths(); if (m_availablePuppetType == FallbackPuppet) importPaths.append(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)); - environment.appendOrSet("QML2_IMPORT_PATH", importPaths.join(pathSep), pathSep); + if (m_availablePuppetType != FallbackPuppet) + environment.appendOrSet("QML2_IMPORT_PATH", importPaths.join(pathSep), pathSep); return environment.toProcessEnvironment(); } -- cgit v1.2.1 From 74f93fe5577c7806059b580022027a5efa981c95 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Jul 2016 11:54:24 +0200 Subject: QmlDesigner: Adding logging to PuppetCreator Change-Id: I9a0450b723ebca82439057e7839e19985da4a2d6 Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/instances/puppetcreator.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 7acc8f114d..09bb5185ba 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -48,10 +48,13 @@ #include #include #include +#include #include #include #include +static Q_LOGGING_CATEGORY(puppetStart, "puppet.start") +static Q_LOGGING_CATEGORY(puppetBuild, "puppet.build") namespace QmlDesigner { @@ -382,6 +385,11 @@ QProcessEnvironment PuppetCreator::processEnvironment() const if (m_availablePuppetType != FallbackPuppet) environment.appendOrSet("QML2_IMPORT_PATH", importPaths.join(pathSep), pathSep); + qCInfo(puppetStart) << Q_FUNC_INFO; + qCInfo(puppetStart) << "Puppet qrc mapping" << m_qrcMapping; + qCInfo(puppetStart) << "Puppet import paths:" << importPaths; + qCInfo(puppetStart) << "Puppet environment:" << environment.toStringList(); + return environment.toProcessEnvironment(); } @@ -454,6 +462,9 @@ bool PuppetCreator::startBuildProcess(const QString &buildDirectoryPath, process.waitForFinished(); + qCInfo(puppetBuild) << Q_FUNC_INFO; + qCInfo(puppetBuild) << m_compileLog; + if (process.exitStatus() == QProcess::NormalExit && process.exitCode() == 0) return true; -- cgit v1.2.1 From 8f393efec07ecf3f56541df54de360f9e10b78b1 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Jul 2016 13:06:50 +0200 Subject: Adding QmlDesigner highlight color to Theme Change-Id: I73d6ec3b7bff5e161de54a3287e3352435753234 Reviewed-by: Thomas Hartmann --- .../propertyEditorQmlSources/HelperWidgets/ColorLogic.qml | 4 ++-- .../qmldesigner/propertyEditorQmlSources/HelperWidgets/Constants.js | 1 - share/qtcreator/themes/dark.creatortheme | 2 ++ share/qtcreator/themes/default.creatortheme | 2 ++ share/qtcreator/themes/flat-dark.creatortheme | 2 ++ share/qtcreator/themes/flat-light.creatortheme | 2 ++ share/qtcreator/themes/flat.creatortheme | 2 ++ src/libs/utils/theme/theme.h | 5 ++++- 8 files changed, 16 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml index 551899f93d..f76a4becc4 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml @@ -40,7 +40,7 @@ QtObject { property bool highlight: textColor === __changedTextColor property color __defaultTextColor: creatorTheme.PanelTextColorLight - property color __changedTextColor: Constants.colorsChangedBaseText + readonly property color __changedTextColor: creatorTheme.QmlDesigner_HighlightColor onBackendValueChanged: { evaluate(); @@ -68,7 +68,7 @@ QtObject { if (baseStateFlag) { if (innerObject.backendValue.isInModel) - innerObject.textColor = Constants.colorsChangedBaseText + innerObject.textColor = __changedTextColor else innerObject.textColor = creatorTheme.PanelTextColorLight } else { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Constants.js b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Constants.js index 7312b76238..228bb1e4be 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Constants.js +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Constants.js @@ -28,5 +28,4 @@ var colorsDisabledText = "gray" var colorsDefaultText = "white" var colorsBoldText = "#dedede" -var colorsChangedBaseText = "#9999ff" var colorsChangedStateText = "#99ccff" diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 1a92bb54fb..9c8435d6ee 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -200,6 +200,8 @@ PaletteWindowTextDisabled=textDisabled PaletteBaseDisabled=backgroundColorDisabled PaletteTextDisabled=textDisabled +QmlDesigner_HighlightColor=ff9999ff + [Flags] ComboBoxDrawTextShadow=false DerivePaletteFromTheme=true diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 712a968555..ab19084e39 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -171,6 +171,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Warning_TextMarkColor=ffc6c132 +QmlDesigner_HighlightColor=ff9999ff + [Flags] ComboBoxDrawTextShadow=true DerivePaletteFromTheme=false diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index bf2b98e834..dcf81c33ed 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -185,6 +185,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffff40 ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Warning_TextMarkColor=ffceff40 +QmlDesigner_HighlightColor=ff9999ff + PaletteWindow=normalBackground PaletteWindowText=text PaletteBase=normalBackground diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index 24e47e1999..fbf129cd00 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -182,6 +182,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Warning_TextMarkColor=ffc6c132 +QmlDesigner_HighlightColor=ff9999ff + [Flags] ComboBoxDrawTextShadow=false DerivePaletteFromTheme=false diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index 84850bed9c..d08f760324 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -181,6 +181,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Warning_TextMarkColor=ffc6c132 +QmlDesigner_HighlightColor=ff9999ff + [Flags] ComboBoxDrawTextShadow=false DerivePaletteFromTheme=false diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 9358f11d28..a32e7b0553 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -279,7 +279,10 @@ public: /* ClangCodeModel Plugin */ ClangCodeModel_Error_TextMarkColor, - ClangCodeModel_Warning_TextMarkColor + ClangCodeModel_Warning_TextMarkColor, + + /* QmlDesigner */ + QmlDesigner_HighlightColor }; enum Gradient { -- cgit v1.2.1 From 5b3242b0b3fa3d833281fef1aedee9f818e2bc99 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 26 Jul 2016 09:29:33 +0200 Subject: Doc: Update icon names Add an image for an icon that consists of 2 masks, and therefore cannot be used directly from source. Change-Id: Iffcf274db1dc1444c894aabaa6452747f95089f8 Reviewed-by: Tim Jenssen --- doc/images/replace.png | Bin 0 -> 715 bytes doc/src/qtquick/creator-mobile-app-tutorial.qdoc | 2 +- doc/src/qtquick/qtquick-app-tutorial.qdoc | 4 ++-- doc/src/qtquick/qtquick-buttons.qdoc | 8 ++++---- doc/src/qtquick/qtquick-designer.qdoc | 2 +- doc/src/qtquick/qtquick-uiforms-tutorial.qdoc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 doc/images/replace.png diff --git a/doc/images/replace.png b/doc/images/replace.png new file mode 100644 index 0000000000..d963646da9 Binary files /dev/null and b/doc/images/replace.png differ diff --git a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc index ed94c4d052..6f93fe81c2 100644 --- a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc +++ b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc @@ -98,7 +98,7 @@ to reference the rectangle from other places. \li Select the \uicontrol Layout tab, and then click - the \inlineimage anchor-fill-normal.png + the \inlineimage anchor_fill.png (\uicontrol {Fill to Parent}) button to anchor the rectangle to the item. diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index 8cc2e7e42f..d478b30d5a 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -109,7 +109,7 @@ size. \li In the \uicontrol Color field, click the - \inlineimage button_color_none_normal.png + \inlineimage icon_color_none.png (\uicontrol Transparent) button to make the rectangle transparent. @@ -131,7 +131,7 @@ \uicontrol Library to \e topLeftRect in the navigator. \li Click \uicontrol {Layout}, and then click the - \inlineimage anchor-fill-normal.png + \inlineimage anchor_fill.png (\uicontrol {Fill to Parent}) button to anchor the mouse area to the rectangle. diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc index 71c3cb2f3d..8fb2e66d20 100644 --- a/doc/src/qtquick/qtquick-buttons.qdoc +++ b/doc/src/qtquick/qtquick-buttons.qdoc @@ -71,7 +71,7 @@ the rectangle and produce rounded corners for the button. \li Select \uicontrol {Layout}, and then select the - \inlineimage anchor-fill-normal.png + \inlineimage anchor_fill.png (\uicontrol {Fill to Parent}) button to anchor the rectangle to the item. @@ -198,7 +198,7 @@ for example button_up.png. \li Click \uicontrol {Layout}, and then click the - \inlineimage anchor-fill-normal.png + \inlineimage anchor_fill.png (\uicontrol {Fill to Parent}) button to anchor the border image to the \uicontrol Item. @@ -248,9 +248,9 @@ \endlist \li Click \uicontrol {Layout}, and then click the - \inlineimage anchor-vertical-normal.png + \inlineimage anchor_vertical.png (\uicontrol {Set Vertical Anchor}) and - \inlineimage anchor-horizontal-normal.png + \inlineimage anchor_horizontal.png (\uicontrol {Set Horizontal Anchor}) buttons to inherit the vertical and horizontal centering from the parent. diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index b2738f38ec..7a143d24c4 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -113,7 +113,7 @@ you remove an item, the child items are also removed. You can show and hide items to focus on specific parts of the application. - Click the \inlineimage button_color_none_normal.png + Click the \inlineimage icon_color_none.png (\uicontrol Transparent) button to change the visibility of an item on the canvas. To change the visibility of an item in the application, select the \uicontrol Visibility diff --git a/doc/src/qtquick/qtquick-uiforms-tutorial.qdoc b/doc/src/qtquick/qtquick-uiforms-tutorial.qdoc index c305d8b1dd..a4b1aea33d 100644 --- a/doc/src/qtquick/qtquick-uiforms-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-uiforms-tutorial.qdoc @@ -73,7 +73,7 @@ \li Select the split view in the navigator, then select the \uicontrol Layout tab in \uicontrol Properties (4), and then click - the \inlineimage anchor-fill-normal.png + the \inlineimage anchor_fill.png (\uicontrol {Fill to Parent}) button to anchor the split view to the item. -- cgit v1.2.1 From ead6853b09e0483198dbe3502a5a9f985768b930 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 26 Jul 2016 09:26:22 +0200 Subject: TextEditor: Remove declarations without definitions Change-Id: I92c9f054fb00e51d166d30424d735c76df5027f1 Reviewed-by: Tim Jenssen --- src/plugins/texteditor/codeassist/genericproposalmodel.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.h b/src/plugins/texteditor/codeassist/genericproposalmodel.h index 07f04209fe..7004770f19 100644 --- a/src/plugins/texteditor/codeassist/genericproposalmodel.h +++ b/src/plugins/texteditor/codeassist/genericproposalmodel.h @@ -63,8 +63,6 @@ public: virtual AssistProposalItemInterface *proposalItem(int index) const; void loadContent(const QList &items); - void setSortingAllowed(bool isAllowed); - bool isSortingAllowed() const; protected: QList m_currentItems; -- cgit v1.2.1 From 9d5705a755d747560440092747a9025c12ba7a72 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 26 Jul 2016 08:52:12 +0200 Subject: Clang: Stop trying to remove duplicate completion items We assume that libclang does not return any duplicates, at least we never noticed any so far. For the concrete test below no duplicates were removed. Function overloads are not problematic because they are folded into one ClangAssistProposalItem (addOverload()). To the completion items from libclang we add the Qt Creator snippets as items. Those might have the same text in the completion list view, but their icon is different (e.g. consider the keyword completion "class" and the Qt Creator snippet "class"), thus the user can still tell them apart. Test: 1. Open src/plugins/clangstaticanalyzer/unit-tests/qt-essential-includes.pro 2. Open main.cpp 3. Complete in the main function Measured with a timer in IpcReceiver::codeCompleted. On Linux, for 20637 completion items: Before: 74ms (avg) Now: 66ms (avg) Gain: 11% Change-Id: I524eaa09f8d9e07c78dc9efcc77f7e021c6f37f7 Reviewed-by: Tim Jenssen --- src/plugins/clangcodemodel/clangassistproposalmodel.cpp | 5 +++++ src/plugins/clangcodemodel/clangassistproposalmodel.h | 2 ++ src/plugins/texteditor/codeassist/genericproposalmodel.cpp | 6 +++++- src/plugins/texteditor/codeassist/genericproposalmodel.h | 1 + src/plugins/texteditor/codeassist/genericproposalwidget.cpp | 3 ++- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp index 06dc7b3198..b134e8fea4 100644 --- a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp +++ b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp @@ -40,6 +40,11 @@ ClangAssistProposalModel::ClangAssistProposalModel( { } +bool ClangAssistProposalModel::containsDuplicates() const +{ + return false; +} + bool ClangAssistProposalModel::isSortable(const QString &/*prefix*/) const { return true; diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.h b/src/plugins/clangcodemodel/clangassistproposalmodel.h index 32b25bf9d0..6a72214513 100644 --- a/src/plugins/clangcodemodel/clangassistproposalmodel.h +++ b/src/plugins/clangcodemodel/clangassistproposalmodel.h @@ -39,6 +39,8 @@ class ClangAssistProposalModel : public TextEditor::GenericProposalModel public: ClangAssistProposalModel(ClangBackEnd::CompletionCorrection neededCorrection); + bool containsDuplicates() const override; + bool isSortable(const QString &prefix) const override; void sort(const QString &prefix) override; diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp index 3b5e14e1fa..1afd0b8451 100644 --- a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp @@ -170,7 +170,6 @@ QString GenericProposalModel::detail(int index) const return m_currentItems.at(index)->detail(); } -// make it optional because it is not needed in many cases void GenericProposalModel::removeDuplicates() { QHash unique; @@ -272,6 +271,11 @@ int GenericProposalModel::persistentId(int index) const return m_idByText.value(m_currentItems.at(index)->text()); } +bool GenericProposalModel::containsDuplicates() const +{ + return true; +} + bool GenericProposalModel::supportsPrefixExpansion() const { return true; diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.h b/src/plugins/texteditor/codeassist/genericproposalmodel.h index 7004770f19..d3ff31fb6f 100644 --- a/src/plugins/texteditor/codeassist/genericproposalmodel.h +++ b/src/plugins/texteditor/codeassist/genericproposalmodel.h @@ -53,6 +53,7 @@ public: virtual QIcon icon(int index) const; virtual QString detail(int index) const; virtual int persistentId(int index) const; + virtual bool containsDuplicates() const; virtual void removeDuplicates(); virtual void filter(const QString &prefix); virtual bool isSortable(const QString &prefix) const; diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 2da949edee..4a1e1eff67 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -407,7 +407,8 @@ void GenericProposalWidget::setIsSynchronized(bool isSync) void GenericProposalWidget::showProposal(const QString &prefix) { ensurePolished(); - d->m_model->removeDuplicates(); + if (d->m_model->containsDuplicates()) + d->m_model->removeDuplicates(); if (!updateAndCheck(prefix)) return; show(); -- cgit v1.2.1 From 8f5059946261746880c4c6c3f2d826552e72412d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Jul 2016 14:25:03 +0200 Subject: QmlDesigner: Use QmlDesigner_HighlightColor consistently This fixes a couple of issue in the .css and we always use the same highlight color (QmlDesigner_HighlightColor). Change-Id: I6522eabc00c30399b2c3b2689256b970ec558719 Reviewed-by: Tim Jenssen --- .../qmldesigner/statesEditorQmlSources/StatesDelegate.qml | 3 --- .../qmldesigner/statesEditorQmlSources/StatesList.qml | 2 +- src/plugins/qmldesigner/components/resources/stylesheet.css | 12 +++--------- .../components/stateseditor/stateseditorwidget.cpp | 1 - .../qmldesignerextension/connectioneditor/stylesheet.css | 6 +++--- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml index 6e13ae4934..07944f7699 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml @@ -101,9 +101,6 @@ Rectangle { statesEditorModel.renameState(internalNodeId, text) } - // as we change the background we need to change the text - // color to see some text - textColor: creatorTheme.PanelTextColorLight } Item { diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml index 1f3fca6e10..57f7efe365 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml @@ -147,7 +147,7 @@ FocusScope { height: delegateHeight isBaseState: 0 == internalNodeId isCurrentState: root.currentStateInternalId == internalNodeId - baseColor: isCurrentState ? Qt.darker(highlightColor, 1.2) : background.color + baseColor: isCurrentState ? creatorTheme.QmlDesigner_HighlightColor : background.color delegateStateName: stateName delegateStateImageSource: stateImageSource delegateStateImageSize: stateImageSize diff --git a/src/plugins/qmldesigner/components/resources/stylesheet.css b/src/plugins/qmldesigner/components/resources/stylesheet.css index f423f75559..15de3f502f 100644 --- a/src/plugins/qmldesigner/components/resources/stylesheet.css +++ b/src/plugins/qmldesigner/components/resources/stylesheet.css @@ -59,19 +59,13 @@ QLineEdit#itemLibrarySearchInput QTreeView { color: creatorTheme.PanelTextColorLight; selection-color: creatorTheme.PanelTextColorLight; - } - - QTreeView::item:selected { - color: creatorTheme.PanelTextColorLight; + selection-background-color: creatorTheme.QmlDesigner_HighlightColor; } QListView { - color:creatorTheme.PanelTextColorLight; + color: creatorTheme.PanelTextColorLight; selection-color: creatorTheme.PanelTextColorLight; - } - - QListView::item:selected { - color: creatorTheme.PanelTextColorLight; + selection-background-color: creatorTheme.QmlDesigner_HighlightColor; } QComboBox QAbstractItemView { diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp index a525196d0a..ae869763cd 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp @@ -96,7 +96,6 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); rootContext()->setContextProperty(QStringLiteral("statesEditorModel"), statesEditorModel); - rootContext()->setContextProperty(QStringLiteral("highlightColor"), Utils::StyleHelper::notTooBrightHighlightColor()); rootContext()->setContextProperty(QLatin1String("canAddNewStates"), true); diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/stylesheet.css b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/stylesheet.css index d3e884ae03..a5c28cb18e 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/stylesheet.css +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/stylesheet.css @@ -8,6 +8,9 @@ QFrame QTableView { color: creatorTheme.PanelTextColorLight; + selection-color: creatorTheme.PanelTextColorLight; + selection-background-color: creatorTheme.QmlDesigner_HighlightColor; + } QTableView::item @@ -24,12 +27,9 @@ QTableView::item:focus QTableView::item:selected { - background-color: qlineargradient(x1: 0, y1: -0.4, x2: 0, y2: 0.6,stop: 0 palette(midlight), stop: 1 palette(highlight)); - border: none } - QHeaderView::section { background-color: #494949; padding: 4px; -- cgit v1.2.1 From b496ac88321d096933f1a280c4f023a4da691683 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Jul 2016 14:26:18 +0200 Subject: QmlDesigner: Adjust QmlDesigner_HighlightColor I use the color from the flat style proposal. This color seems to work good enough in all themes. Change-Id: Ie543236fb578141bd3c1fb12c783597b26b12138 Reviewed-by: Tim Jenssen --- share/qtcreator/themes/dark.creatortheme | 2 +- share/qtcreator/themes/default.creatortheme | 2 +- share/qtcreator/themes/flat-dark.creatortheme | 2 +- share/qtcreator/themes/flat-light.creatortheme | 2 +- share/qtcreator/themes/flat.creatortheme | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 9c8435d6ee..1963587a2b 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -200,7 +200,7 @@ PaletteWindowTextDisabled=textDisabled PaletteBaseDisabled=backgroundColorDisabled PaletteTextDisabled=textDisabled -QmlDesigner_HighlightColor=ff9999ff +QmlDesigner_HighlightColor=ff46a2da [Flags] ComboBoxDrawTextShadow=false diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index ab19084e39..da10636a8f 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -171,7 +171,7 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Warning_TextMarkColor=ffc6c132 -QmlDesigner_HighlightColor=ff9999ff +QmlDesigner_HighlightColor=ff46a2da [Flags] ComboBoxDrawTextShadow=true diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index dcf81c33ed..820b7fa887 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -185,7 +185,7 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffff40 ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Warning_TextMarkColor=ffceff40 -QmlDesigner_HighlightColor=ff9999ff +QmlDesigner_HighlightColor=ff46a2da PaletteWindow=normalBackground PaletteWindowText=text diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index fbf129cd00..6c8d65440a 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -182,7 +182,7 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Warning_TextMarkColor=ffc6c132 -QmlDesigner_HighlightColor=ff9999ff +QmlDesigner_HighlightColor=ff46a2da [Flags] ComboBoxDrawTextShadow=false diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index d08f760324..2f49efef57 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -181,7 +181,7 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Warning_TextMarkColor=ffc6c132 -QmlDesigner_HighlightColor=ff9999ff +QmlDesigner_HighlightColor=ff46a2da [Flags] ComboBoxDrawTextShadow=false -- cgit v1.2.1 From 3e4cbdb69f44b233402e66fb6e1b6989de61c195 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 26 Jul 2016 15:14:11 +0200 Subject: QmlDesigner: Themable text alignment icons Change-Id: If499c4e131a0c56d24afb6ae355d1b8bd6338435 Reviewed-by: Thomas Hartmann --- .../HelperWidgets/AligmentHorizontalButtons.qml | 6 +- .../HelperWidgets/AligmentVerticalButtons.qml | 6 +- .../HelperWidgets/ButtonRowButton.qml | 1 + .../images/alignmentbottom-h-icon.png | Bin 91 -> 0 bytes .../HelperWidgets/images/alignmentbottom-icon.png | Bin 91 -> 0 bytes .../images/alignmentcenterh-h-icon.png | Bin 165 -> 0 bytes .../HelperWidgets/images/alignmentcenterh-icon.png | Bin 158 -> 0 bytes .../HelperWidgets/images/alignmentleft-h-icon.png | Bin 97 -> 0 bytes .../HelperWidgets/images/alignmentleft-icon.png | Bin 90 -> 0 bytes .../images/alignmentmiddle-h-icon.png | Bin 91 -> 0 bytes .../HelperWidgets/images/alignmentmiddle-icon.png | Bin 91 -> 0 bytes .../HelperWidgets/images/alignmentright-h-icon.png | Bin 184 -> 0 bytes .../HelperWidgets/images/alignmentright-icon.png | Bin 172 -> 0 bytes .../HelperWidgets/images/alignmenttop-h-icon.png | Bin 102 -> 0 bytes .../HelperWidgets/images/alignmenttop-icon.png | Bin 101 -> 0 bytes .../qmleditorwidgets/images/alignment_bottom.png | Bin 0 -> 91 bytes .../qmleditorwidgets/images/alignment_center.png | Bin 0 -> 105 bytes .../qmleditorwidgets/images/alignment_left.png | Bin 0 -> 103 bytes .../qmleditorwidgets/images/alignment_middle.png | Bin 0 -> 93 bytes .../qmleditorwidgets/images/alignment_right.png | Bin 0 -> 102 bytes src/libs/qmleditorwidgets/images/alignment_top.png | Bin 0 -> 93 bytes src/libs/qmleditorwidgets/resources.qrc | 6 ++ .../componentcore/qmldesignericonprovider.cpp | 36 ++++++++ src/tools/icons/qtcreatoricons.svg | 99 +++++++++++++++++++++ 24 files changed, 148 insertions(+), 6 deletions(-) delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentbottom-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentbottom-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentcenterh-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentcenterh-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentleft-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentleft-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentmiddle-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentmiddle-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentright-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentright-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmenttop-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmenttop-icon.png create mode 100644 src/libs/qmleditorwidgets/images/alignment_bottom.png create mode 100644 src/libs/qmleditorwidgets/images/alignment_center.png create mode 100644 src/libs/qmleditorwidgets/images/alignment_left.png create mode 100644 src/libs/qmleditorwidgets/images/alignment_middle.png create mode 100644 src/libs/qmleditorwidgets/images/alignment_right.png create mode 100644 src/libs/qmleditorwidgets/images/alignment_top.png diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml index 76de3d54ea..560a8c8869 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml @@ -92,21 +92,21 @@ Row { ButtonRowButton { roundLeftButton: false - iconSource: blueHighlight ? "images/alignmentleft-h-icon.png" : "images/alignmentleft-icon.png" + iconSource: "image://icons/alignment-left" + (blueHighlight ? "-h" : "") onClicked: { if (checked) backendValue.setEnumeration("Text", "AlignLeft") } } ButtonRowButton { - iconSource: blueHighlight ? "images/alignmentcenterh-h-icon.png" : "images/alignmentcenterh-icon.png" + iconSource: "image://icons/alignment-center" + (blueHighlight ? "-h" : "") onClicked: { if (checked) backendValue.setEnumeration("Text", "AlignHCenter") } } ButtonRowButton { - iconSource: blueHighlight ? "images/alignmentright-h-icon.png" : "images/alignmentright-icon.png" + iconSource: "image://icons/alignment-right" + (blueHighlight ? "-h" : "") onClicked: { if (checked) backendValue.setEnumeration("Text", "AlignRight") diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml index ba2b43721c..62a17c8f38 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml @@ -93,21 +93,21 @@ Row { ButtonRowButton { roundLeftButton: false - iconSource: blueHighlight ? "images/alignmenttop-h-icon.png" : "images/alignmenttop-icon.png" + iconSource: "image://icons/alignment-top" + (blueHighlight ? "-h" : "") onClicked: { if (checked) backendValue.setEnumeration("Text", "AlignTop") } } ButtonRowButton { - iconSource: blueHighlight ? "images/alignmentmiddle-h-icon.png" : "images/alignmentmiddle-icon.png" + iconSource: "image://icons/alignment-middle" + (blueHighlight ? "-h" : "") onClicked: { if (checked) backendValue.setEnumeration("Text", "AlignVCenter") } } ButtonRowButton { - iconSource: blueHighlight ? "images/alignmentbottom-h-icon.png" : "images/alignmentbottom-icon.png" + iconSource: "image://icons/alignment-bottom" + (blueHighlight ? "-h" : "") onClicked: { if (checked) backendValue.setEnumeration("Text", "AlignBottom") diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml index 61975a6946..f414ceadad 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml @@ -86,6 +86,7 @@ Item { id: image width: 16 height: 16 + smooth: false anchors.centerIn: parent } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentbottom-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentbottom-h-icon.png deleted file mode 100644 index 6ebf5b67d4..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentbottom-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentbottom-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentbottom-icon.png deleted file mode 100644 index 99344eb305..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentbottom-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentcenterh-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentcenterh-h-icon.png deleted file mode 100644 index 2f31cb90c5..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentcenterh-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentcenterh-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentcenterh-icon.png deleted file mode 100644 index 30279b6907..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentcenterh-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentleft-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentleft-h-icon.png deleted file mode 100644 index 6f3db311ed..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentleft-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentleft-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentleft-icon.png deleted file mode 100644 index 9cb8bef8ab..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentleft-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentmiddle-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentmiddle-h-icon.png deleted file mode 100644 index 7b54c5b676..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentmiddle-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentmiddle-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentmiddle-icon.png deleted file mode 100644 index 670a195d55..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentmiddle-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentright-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentright-h-icon.png deleted file mode 100644 index 8ddd089e33..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentright-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentright-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentright-icon.png deleted file mode 100644 index f97d371d6a..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmentright-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmenttop-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmenttop-h-icon.png deleted file mode 100644 index 207bedbc1a..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmenttop-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmenttop-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmenttop-icon.png deleted file mode 100644 index 1d3bb8ec72..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/alignmenttop-icon.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/alignment_bottom.png b/src/libs/qmleditorwidgets/images/alignment_bottom.png new file mode 100644 index 0000000000..71c641633a Binary files /dev/null and b/src/libs/qmleditorwidgets/images/alignment_bottom.png differ diff --git a/src/libs/qmleditorwidgets/images/alignment_center.png b/src/libs/qmleditorwidgets/images/alignment_center.png new file mode 100644 index 0000000000..a27ce588c7 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/alignment_center.png differ diff --git a/src/libs/qmleditorwidgets/images/alignment_left.png b/src/libs/qmleditorwidgets/images/alignment_left.png new file mode 100644 index 0000000000..823ac2348c Binary files /dev/null and b/src/libs/qmleditorwidgets/images/alignment_left.png differ diff --git a/src/libs/qmleditorwidgets/images/alignment_middle.png b/src/libs/qmleditorwidgets/images/alignment_middle.png new file mode 100644 index 0000000000..ea39e222a7 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/alignment_middle.png differ diff --git a/src/libs/qmleditorwidgets/images/alignment_right.png b/src/libs/qmleditorwidgets/images/alignment_right.png new file mode 100644 index 0000000000..4e6555a356 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/alignment_right.png differ diff --git a/src/libs/qmleditorwidgets/images/alignment_top.png b/src/libs/qmleditorwidgets/images/alignment_top.png new file mode 100644 index 0000000000..2d692a766b Binary files /dev/null and b/src/libs/qmleditorwidgets/images/alignment_top.png differ diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index c7c41667dd..08e8af4ab1 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -55,5 +55,11 @@ images/anchor_vertical@2x.png images/anchoreditem.png images/anchoreditem@2x.png + images/alignment_center.png + images/alignment_left.png + images/alignment_right.png + images/alignment_bottom.png + images/alignment_middle.png + images/alignment_top.png diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index 9693d5f1f5..08d22e44a2 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -111,6 +111,42 @@ QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, c else if (id == "anchor-fill") result = Icon({ { ":/qmldesigner/images/anchor_fill.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-left") + result = Icon({ + { ":/qmldesigner/images/alignment_left.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-left-h") + result = Icon({ + { ":/qmldesigner/images/alignment_left.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-center") + result = Icon({ + { ":/qmldesigner/images/alignment_center.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-center-h") + result = Icon({ + { ":/qmldesigner/images/alignment_center.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-right") + result = Icon({ + { ":/qmldesigner/images/alignment_right.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-right-h") + result = Icon({ + { ":/qmldesigner/images/alignment_right.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-top") + result = Icon({ + { ":/qmldesigner/images/alignment_top.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-top-h") + result = Icon({ + { ":/qmldesigner/images/alignment_top.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-middle") + result = Icon({ + { ":/qmldesigner/images/alignment_middle.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-middle-h") + result = Icon({ + { ":/qmldesigner/images/alignment_middle.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-bottom") + result = Icon({ + { ":/qmldesigner/images/alignment_bottom.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "alignment-bottom-h") + result = Icon({ + { ":/qmldesigner/images/alignment_bottom.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); else qWarning() << Q_FUNC_INFO << "Image not found:" << id; diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 9e9bf7deb6..12e27fa62f 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -1795,6 +1795,105 @@ width="100%" height="100%" /> + + + + + + + + + + + + + + + + + + + + + Date: Tue, 26 Jul 2016 18:17:11 +0200 Subject: Core: Fix initially visible progress bar Call updateVisibility() in ProgressManagerPrivate::init() to ensure that it is really invisible when launching Qt Creator. Also make sure that the opacity for the visible progress bar is 1.0 instead of 0.7 (which is the default opacity in QGraphicsOpacityEffect). Task-number: QTCREATORBUG-16003 Change-Id: Ic268d903ce624c9e0b4c11e213002a22be1fba63 Reviewed-by: hjk --- src/plugins/coreplugin/progressmanager/progressmanager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index 9254997c18..3b3c1cf6fc 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -273,6 +273,7 @@ ProgressManagerPrivate::ProgressManagerPrivate() m_progressViewPinned(false), m_hovered(false) { + m_opacityEffect->setOpacity(1); m_instance = this; m_progressView = new ProgressView; // withDelay, so the statusBarWidget has the chance to get the enter event @@ -346,7 +347,7 @@ void ProgressManagerPrivate::init() this, &ProgressManagerPrivate::progressDetailsToggled); toggleButton->setDefaultAction(cmd->action()); - m_progressView->setVisible(m_progressViewPinned); + updateVisibility(); initInternal(); } -- cgit v1.2.1 From 02be113ce3a67601764fd756337cfd0424b2567a Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Jul 2016 16:07:48 +0200 Subject: QmlDesigner.PropertyEditor: Exchange colors for buttons This way the button and button states are easier to grasp. Change-Id: I78421fd5da7a879b728e5aece3ed29c61d7d2c17 Reviewed-by: Alessandro Portale --- .../propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml | 4 ++-- .../propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml index f414ceadad..ef134a1a55 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml @@ -69,7 +69,7 @@ Item { anchors.fill: parent visible: checked - color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate + color: creatorTheme.QmlDesignerBackgroundColorDarker } RoundedPanel { @@ -78,7 +78,7 @@ Item { anchors.fill: parent visible: !checked - color: creatorTheme.QmlDesignerBackgroundColorDarker + color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml index ca9f423307..6f5afaa5a9 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml @@ -43,7 +43,7 @@ Rectangle { */ border.width: roundLeft || roundRight ? 1 : 0 - color: creatorTheme.BackgroundColorDark + color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate border.color: creatorTheme.QmlDesignerBackgroundColorDarker Rectangle { -- cgit v1.2.1 From fb9638f8c94092e8ba6f67e2ec45fe47b925b471 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Jul 2016 15:49:51 +0200 Subject: QmlDesigner.PropertyEditor: Fix resetting of alignment This change makes sure that the default horizontal or vertical alignment is selected after resetting it. Change-Id: I057a8f0a0c1c343c89902c38ec4d39828deaaef3 Reviewed-by: Alessandro Portale --- .../HelperWidgets/AligmentHorizontalButtons.qml | 2 ++ .../propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml index 560a8c8869..7e777ec678 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml @@ -48,6 +48,8 @@ Row { property bool baseStateFlag: isBaseState; onValueChanged: { + buttonRow.initalChecked = 0 + buttonRow.checkedIndex = 0 if (value !== undefined) { if (value === "AlignLeft") { buttonRow.initalChecked = 0 diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml index 62a17c8f38..b36d93656c 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml @@ -49,6 +49,8 @@ Row { property bool baseStateFlag: isBaseState; onValueChanged: { + buttonRow.initalChecked = 0 + buttonRow.checkedIndex = 0 if (value !== undefined) { if (value === "AlignTop") { buttonRow.initalChecked = 0 -- cgit v1.2.1 From 3752a67de78b227f46d1a93d4595fd5b4084cf3b Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 26 Jul 2016 17:26:00 +0200 Subject: QmlDesigner: Themable and HighDPI Text style icons Change-Id: Ib677d38d660b631a235c00c1e37590780aadb252 Reviewed-by: Thomas Hartmann --- .../HelperWidgets/FontStyleButtons.qml | 16 ++-- .../HelperWidgets/images/bold-h-icon.png | Bin 247 -> 0 bytes .../HelperWidgets/images/bold-icon.png | Bin 247 -> 0 bytes .../HelperWidgets/images/italic-h-icon.png | Bin 218 -> 0 bytes .../HelperWidgets/images/italic-icon.png | Bin 218 -> 0 bytes .../HelperWidgets/images/strikeout-h-icon.png | Bin 314 -> 0 bytes .../HelperWidgets/images/strikeout-icon.png | Bin 314 -> 0 bytes .../HelperWidgets/images/underline-h-icon.png | Bin 206 -> 0 bytes .../HelperWidgets/images/underline-icon.png | Bin 207 -> 0 bytes src/libs/qmleditorwidgets/images/style_bold.png | Bin 0 -> 194 bytes src/libs/qmleditorwidgets/images/style_bold@2x.png | Bin 0 -> 332 bytes src/libs/qmleditorwidgets/images/style_italic.png | Bin 0 -> 150 bytes .../qmleditorwidgets/images/style_italic@2x.png | Bin 0 -> 256 bytes .../qmleditorwidgets/images/style_strikeout.png | Bin 0 -> 201 bytes .../qmleditorwidgets/images/style_strikeout@2x.png | Bin 0 -> 377 bytes .../qmleditorwidgets/images/style_underline.png | Bin 0 -> 185 bytes .../qmleditorwidgets/images/style_underline@2x.png | Bin 0 -> 319 bytes src/libs/qmleditorwidgets/resources.qrc | 8 ++ .../componentcore/qmldesignericonprovider.cpp | 24 ++++++ src/tools/icons/qtcreatoricons.svg | 81 +++++++++++++++++++++ 20 files changed, 121 insertions(+), 8 deletions(-) delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/bold-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/bold-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/italic-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/italic-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/strikeout-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/strikeout-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/underline-h-icon.png delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/underline-icon.png create mode 100644 src/libs/qmleditorwidgets/images/style_bold.png create mode 100644 src/libs/qmleditorwidgets/images/style_bold@2x.png create mode 100644 src/libs/qmleditorwidgets/images/style_italic.png create mode 100644 src/libs/qmleditorwidgets/images/style_italic@2x.png create mode 100644 src/libs/qmleditorwidgets/images/style_strikeout.png create mode 100644 src/libs/qmleditorwidgets/images/style_strikeout@2x.png create mode 100644 src/libs/qmleditorwidgets/images/style_underline.png create mode 100644 src/libs/qmleditorwidgets/images/style_underline@2x.png diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontStyleButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontStyleButtons.qml index 4ab413a087..23e5db53e5 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontStyleButtons.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontStyleButtons.qml @@ -34,24 +34,24 @@ ButtonRow { property variant strikeout: backendValues.font_strikeout BoolButtonRowButton { - standardIconSource: "images/bold-icon.png" - highlightedIconSource: "images/bold-h-icon.png" + standardIconSource: "image://icons/style-bold" + highlightedIconSource: "image://icons/style-bold-h" backendValue: bold } BoolButtonRowButton { - standardIconSource: "images/italic-icon.png" - highlightedIconSource: "images/italic-h-icon.png" + standardIconSource: "image://icons/style-italic" + highlightedIconSource: "image://icons/style-italic-h" backendValue: italic } BoolButtonRowButton { - standardIconSource: "images/underline-icon.png" - highlightedIconSource: "images/underline-h-icon.png" + standardIconSource: "image://icons/style-underline" + highlightedIconSource: "image://icons/style-underline-h" backendValue: underline } BoolButtonRowButton { - standardIconSource: "images/strikeout-icon.png" - highlightedIconSource: "images/strikeout-h-icon.png" + standardIconSource: "image://icons/style-strikeout" + highlightedIconSource: "image://icons/style-strikeout-h" backendValue: strikeout } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/bold-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/bold-h-icon.png deleted file mode 100644 index fc65042bc9..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/bold-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/bold-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/bold-icon.png deleted file mode 100644 index b6db27e081..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/bold-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/italic-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/italic-h-icon.png deleted file mode 100644 index 91ba0067fe..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/italic-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/italic-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/italic-icon.png deleted file mode 100644 index 20e3e37977..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/italic-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/strikeout-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/strikeout-h-icon.png deleted file mode 100644 index 523ca7b389..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/strikeout-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/strikeout-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/strikeout-icon.png deleted file mode 100644 index 70ce08597c..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/strikeout-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/underline-h-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/underline-h-icon.png deleted file mode 100644 index a6697339d1..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/underline-h-icon.png and /dev/null differ diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/underline-icon.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/underline-icon.png deleted file mode 100644 index d8439905b6..0000000000 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/underline-icon.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/style_bold.png b/src/libs/qmleditorwidgets/images/style_bold.png new file mode 100644 index 0000000000..75632cc838 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/style_bold.png differ diff --git a/src/libs/qmleditorwidgets/images/style_bold@2x.png b/src/libs/qmleditorwidgets/images/style_bold@2x.png new file mode 100644 index 0000000000..3ddf0c0db6 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/style_bold@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/style_italic.png b/src/libs/qmleditorwidgets/images/style_italic.png new file mode 100644 index 0000000000..5c421dbca4 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/style_italic.png differ diff --git a/src/libs/qmleditorwidgets/images/style_italic@2x.png b/src/libs/qmleditorwidgets/images/style_italic@2x.png new file mode 100644 index 0000000000..cbbeb26349 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/style_italic@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/style_strikeout.png b/src/libs/qmleditorwidgets/images/style_strikeout.png new file mode 100644 index 0000000000..097aea8c1b Binary files /dev/null and b/src/libs/qmleditorwidgets/images/style_strikeout.png differ diff --git a/src/libs/qmleditorwidgets/images/style_strikeout@2x.png b/src/libs/qmleditorwidgets/images/style_strikeout@2x.png new file mode 100644 index 0000000000..573c867e6d Binary files /dev/null and b/src/libs/qmleditorwidgets/images/style_strikeout@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/style_underline.png b/src/libs/qmleditorwidgets/images/style_underline.png new file mode 100644 index 0000000000..2aaa067427 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/style_underline.png differ diff --git a/src/libs/qmleditorwidgets/images/style_underline@2x.png b/src/libs/qmleditorwidgets/images/style_underline@2x.png new file mode 100644 index 0000000000..96a32ef897 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/style_underline@2x.png differ diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 08e8af4ab1..5c7164c7b8 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -61,5 +61,13 @@ images/alignment_bottom.png images/alignment_middle.png images/alignment_top.png + images/style_bold.png + images/style_bold@2x.png + images/style_italic.png + images/style_italic@2x.png + images/style_underline.png + images/style_underline@2x.png + images/style_strikeout.png + images/style_strikeout@2x.png diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index 08d22e44a2..6efb9c8d5e 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -147,6 +147,30 @@ QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, c else if (id == "alignment-bottom-h") result = Icon({ { ":/qmldesigner/images/alignment_bottom.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); + else if (id == "style-bold") + result = Icon({ + { ":/qmldesigner/images/style_bold.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "style-bold-h") + result = Icon({ + { ":/qmldesigner/images/style_bold.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); + else if (id == "style-italic") + result = Icon({ + { ":/qmldesigner/images/style_italic.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "style-italic-h") + result = Icon({ + { ":/qmldesigner/images/style_italic.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); + else if (id == "style-underline") + result = Icon({ + { ":/qmldesigner/images/style_underline.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "style-underline-h") + result = Icon({ + { ":/qmldesigner/images/style_underline.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); + else if (id == "style-strikeout") + result = Icon({ + { ":/qmldesigner/images/style_strikeout.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "style-strikeout-h") + result = Icon({ + { ":/qmldesigner/images/style_strikeout.png", Theme::QmlDesigner_HighlightColor}}, Icon::Tint).pixmap(); else qWarning() << Q_FUNC_INFO << "Image not found:" << id; diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 12e27fa62f..5973cedc54 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -5964,5 +5964,86 @@ id="rect5583" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + -- cgit v1.2.1 From a5b0525b79555439a4138e9a9c44f60518feed51 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 21 Jul 2016 18:03:40 +0200 Subject: QML Debugger: Don't pretend the engine is interrupted when it isn't After sending the interrupt request the application will continue to the next line of JavaScript and only interrupt then. There is no way to interrupt the application via the JS debugger as long as no JS engine is active. The downside of this is that the pause/continue/stop icons are disabled until the application actually interrupts. The user might not understand this. Change-Id: I355de52f65898d6bdcd437675adba368662f3c13 Task-number: QTCREATORBUG-16646 Reviewed-by: hjk --- src/plugins/debugger/qml/qmlengine.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 26a6661a8b..a50c319af9 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -661,7 +661,7 @@ void QmlEngine::interruptInferior() { showMessage(INTERRUPT, LogInput); d->runDirectCommand(INTERRUPT); - notifyInferiorStopOk(); + showStatusMessage(tr("Waiting for JavaScript engine to interrupt on next statement.")); } void QmlEngine::executeStep() @@ -1966,7 +1966,8 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data) } engine->notifyInferiorSpontaneousStop(); backtrace(); - } else if (engine->state() == InferiorStopOk) { + } else if (engine->state() == InferiorStopRequested) { + engine->notifyInferiorStopOk(); backtrace(); } } -- cgit v1.2.1 From 87db5ba69f944032ac5937a507641049cce94fa6 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 26 Jul 2016 16:12:24 +0200 Subject: Doc: Add docs for "Import as qmake Project" wizard Change-Id: I38bcf939a9092c7f77d2b0839df4477e68462101 Reviewed-by: hjk --- doc/src/projects/creator-projects-creating.qdoc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 17ada48109..b8c29a366e 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -241,6 +241,15 @@ information on how version control systems are integrated in \QC, see \l{Using Version Control Systems} + \li Import as qmake Project + + Import an existing project that does not use any of the supported + build systems: qmake, Qbs, CMake, or Autotools. The wizard creates + a qmake .pro file, which enables you to use \QC as a code editor and + as a launcher for debugging and analysis tools. However, if you want + to build the project, you might need to edit the generated .pro + file. + \li Import Existing Project Import an existing project that does not use any of the supported -- cgit v1.2.1 From 4ae368ddbb110fea4280541072d4f02fe2e6ed7a Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 26 Jul 2016 11:32:37 +0200 Subject: Clang: Set limit for sorting completion items Having *some* limit is reasonable since sorting happens in the UI thread and given enough includes/symbols it will freeze sooner or later. The strategy is now: Stop sorting at all if there are more than 30.000 completion items to process. The limit is a guess made on the following measurements. The goal is to keep below 100ms. test | items | before | now -----+----------------------- Cpp1 | 6394 | 172ms | 15ms | Win1 | 44739 | 125ms | 56ms | Qtc1 | 9648, | 16ms | 15ms | Qtc2 | 10210 | 20ms | 16ms | Qtc3 | 51044 | 141ms | 63ms | Qt1 | 62953 | 172ms | 78ms | Windows.h alone pulls in about 44.000 completion items. Used test procedure ------------------- For each test below, do: 1. Start Qt Creator in release mode 2. Open/create the project with a MSVC2015 Kit 3. Open the mentioned file 4. Strg+Space in the mentioned function Measured with a timer in IpcReceiver::codeCompleted. Test projects: Cpp1: stdc++11-includes.pro, main.cpp, main() Win1: Create project from wizard, *.cpp file including windows.h, completion in some added function Qtc1: qtcreator.pro, texteditor.cpp, BaseTextEditor::duplicate() Qtc2: qtcreator.pro, fakevimhandler.cpp, FakeVimHandler::jumpToLocalMark Qtc3: qtcreator.pro, botan.cpp, version_string() Qt1: qt-essential-includes.pro, main.cpp, main() Change-Id: I6fbd65d14f6086f289be7dd6c24385996e4bde83 Reviewed-by: Tim Jenssen Reviewed-by: Alessandro Portale --- src/plugins/clangcodemodel/clangassistproposalmodel.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp index b134e8fea4..c2adf179b7 100644 --- a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp +++ b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp @@ -34,6 +34,8 @@ namespace ClangCodeModel { namespace Internal { +const int SORT_LIMIT = 30000; + ClangAssistProposalModel::ClangAssistProposalModel( ClangBackEnd::CompletionCorrection neededCorrection) : m_neededCorrection(neededCorrection) @@ -47,7 +49,7 @@ bool ClangAssistProposalModel::containsDuplicates() const bool ClangAssistProposalModel::isSortable(const QString &/*prefix*/) const { - return true; + return m_currentItems.size() <= SORT_LIMIT; } void ClangAssistProposalModel::sort(const QString &/*prefix*/) -- cgit v1.2.1 From 909f81509833c857d2a92a5b9a5aed76c4a07ce6 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 27 Jul 2016 10:56:39 +0200 Subject: Doc: Java class wizard Change-Id: I65a68dca5c2f1db578c250bcbac7fc06951a8355 Reviewed-by: hjk --- doc/src/projects/creator-projects-creating.qdoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index b8c29a366e..91becd0bd5 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -331,6 +331,10 @@ \endlist + \li Java + + Java class files that you can use to create Java classes. + \li Python Python class and source files that you can use to create Python -- cgit v1.2.1 From 84f84890fd83f33b72c97f333e460870c853261c Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 26 Jul 2016 13:19:22 +0200 Subject: Squish: Use shadow builds in tst_debug_empty_main So MSVC2010 and MSVC2013 don't get in their way. Change-Id: Idb248e86dbe904e2f3867d793b80119f7e2dc31c Reviewed-by: Christian Stenger --- .../suite_debugger/tst_debug_empty_main/test.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/system/suite_debugger/tst_debug_empty_main/test.py b/tests/system/suite_debugger/tst_debug_empty_main/test.py index c06dcefc26..f371b5ec22 100644 --- a/tests/system/suite_debugger/tst_debug_empty_main/test.py +++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py @@ -55,7 +55,7 @@ def main(): editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") typeLines(editor, ["int main() {"]) invokeMenuItem("File", "Save All") - performDebugging(workingDir, projectName, checkedTargets) + performDebugging(projectName, checkedTargets) invokeMenuItem("File", "Close All Projects and Editors") # C/C++ targets = Targets.intToArray(Targets.desktopTargetClasses()) @@ -75,7 +75,7 @@ def main(): invokeMenuItem("File", "Save All") progressBarWait(15000) setRunInTerminal(1, 0, False) - performDebugging(workingDir, projectName, [singleTarget]) + performDebugging(projectName, [singleTarget]) invokeMenuItem("File", "Close All Projects and Editors") invokeMenuItem("File", "Exit") @@ -89,15 +89,21 @@ def __handleAppOutputWaitForDebuggerFinish__(): invokeMenuItem("Debug", "Abort Debugging") waitFor("str(appOutput.plainText).endswith('Debugging has finished')", 5000) -def performDebugging(workingDir, projectName, checkedTargets): +def performDebugging(projectName, checkedTargets): for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"): test.log("Selecting '%s' as build config" % config) - verifyBuildConfig(len(checkedTargets), kit, config, True) + verifyBuildConfig(len(checkedTargets), kit, config, True, True) progressBarWait(10000) invokeMenuItem("Build", "Rebuild All") waitForCompile() isMsvc = isMsvcConfig(len(checkedTargets), kit) - allowAppThroughWinFW(workingDir, projectName, False) + if platform.system() in ('Microsoft' 'Windows'): + switchViewTo(ViewConstants.PROJECTS) + switchToBuildOrRunSettingsFor(len(checkedTargets), kit, ProjectSettings.BUILD) + buildDir = os.path.join(str(waitForObject(":Qt Creator_Utils::BuildDirectoryLineEdit").text), + "debug") + switchViewTo(ViewConstants.EDIT) + allowAppThroughWinFW(buildDir, projectName, None) clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")) handleDebuggerWarnings(config, isMsvc) waitForObject(":Qt Creator.DebugModeWidget_QSplitter") @@ -112,4 +118,5 @@ def performDebugging(workingDir, projectName, checkedTargets): clickButton(waitForObject(":*Qt Creator.Continue_Core::Internal::FancyToolButton")) __handleAppOutputWaitForDebuggerFinish__() removeOldBreakpoints() - deleteAppFromWinFW(workingDir, projectName, False) + if platform.system() in ('Microsoft' 'Windows'): + deleteAppFromWinFW(buildDir, projectName, None) -- cgit v1.2.1 From bde4362dad875ec11732161c841e4f0e406f8102 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 25 Jul 2016 17:49:25 +0200 Subject: Squish: Replace Qt 5.2.1 kit with Qt 5.6.1 Change-Id: I5865024f55a68bc2860f5b8b0b7c9c37775cc122 Reviewed-by: Robert Loehning Reviewed-by: Christian Stenger --- tests/system/README | 4 +-- .../settings/mac/QtProject/qtcreator/profiles.xml | 4 +-- .../settings/mac/QtProject/qtcreator/qtversion.xml | 4 +-- .../settings/unix/QtProject/qtcreator/profiles.xml | 33 +++++++++++----------- .../unix/QtProject/qtcreator/qtversion.xml | 18 ++++++------ .../windows/QtProject/qtcreator/profiles.xml | 24 ++++++++-------- .../windows/QtProject/qtcreator/qtversion.xml | 20 ++++++------- .../windows/QtProject/qtcreator/toolchains.xml | 15 ++++++++-- tests/system/shared/classes.py | 17 ++++------- tests/system/shared/project.py | 6 ++-- tests/system/suite_editors/tst_qml_editor/test.py | 2 +- .../suite_qtquick/tst_qtquick_creation3/test.py | 8 +++--- .../suite_qtquick/tst_qtquick_creation4/test.py | 2 +- 13 files changed, 82 insertions(+), 75 deletions(-) diff --git a/tests/system/README b/tests/system/README index d84b30fa8b..953f0d953d 100644 --- a/tests/system/README +++ b/tests/system/README @@ -9,9 +9,9 @@ On Linux/Mac this is ~/QtSDK, and on Windows this is C:\QtSDK. After installing the QtSDK you should use the package manager of the QtSDK (SDKMaintenanceTool) to add some more packages. You'll need at least Desktop Qt versions 4.7.4, 4.8.0, Harmattan stuff (except QEmu), Maemo Toolchain, Qt Examples, Simulator, Documentation files. -Third - some of the test suites/test cases expect Qt 5.2.1 (default toolchain), Qt 5.3.1 (default toolchain) and Qt 5.4.1 (gcc, Linux and Windows only) +Third - some of the test suites/test cases expect Qt 5.3.1 (default toolchain), Qt 5.4.1 (gcc, Linux and Windows only) and Qt 5.6.1-1 (default toolchain) installed in their default locations. On Linux/Mac this is ~/Qt5.x.1 and on Windows this is C:\Qt\Qt5.x.1. The default toolchains are gcc on Linux, -clang on Mac and MSVC2010 on Windows. +clang on Mac and MSVC2010 (Qt <= 5.5) or MSVC2013 (Qt > 5.5) on Windows. It's easiest to use default installations of the official opensource Qt packages. Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below). These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on). diff --git a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml index ca971e6011..124113a265 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml @@ -125,7 +125,7 @@ :///DESKTOP/// {fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a} - Desktop 521 default + Desktop 561 default false @@ -180,7 +180,7 @@ Profile.Default - {fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a} + {a1e860d1-c241-4abf-80fe-cf0c9f0a43b3} Version diff --git a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml index 941d0cac12..909dcb9eee 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml @@ -56,8 +56,8 @@ QtVersion.5 9 - Desktop Qt 5.2.1 (SQUISH_DEFAULT_COMPILER) - ~/Qt5.2.1/5.2.1/SQUISH_DEFAULT_COMPILER/bin/qmake + Desktop Qt 5.6.1 (SQUISH_DEFAULT_COMPILER) + ~/Qt5.6.1/5.6/SQUISH_DEFAULT_COMPILER/bin/qmake Qt4ProjectManager.QtVersion.Desktop false diff --git a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml index 5e08ff946d..6526ccdc57 100644 --- a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml @@ -1,6 +1,6 @@ - + Profile.0 @@ -111,7 +111,6 @@ Profile.5 false - {70e26273-2c0b-4534-bbc0-eb6ca670821a} @@ -120,20 +119,20 @@ ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371} - 9 + 2 :///DESKTOP/// - {17ae70be-817d-4019-9337-fa7761c4b0ed} + {1dcb5509-1670-470d-80a5-8a988f36e4e2} - Desktop 521 default + Desktop 480 GCC false - Profile.6 false + {70e26273-2c0b-4534-bbc0-eb6ca670821a} @@ -142,13 +141,14 @@ ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371} - 2 + 11 :///DESKTOP/// - {1dcb5509-1670-470d-80a5-8a988f36e4e2} + {e91398ba-6443-4b02-b416-782a70d9df90} - Desktop 480 GCC + Desktop 531 default false + @@ -161,15 +161,16 @@ {70e26273-2c0b-4534-bbc0-eb6ca670821a} Desktop Device Desktop + ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371} - 11 + 13 :///DESKTOP/// - {e91398ba-6443-4b02-b416-782a70d9df90} + {8ca91e21-c12e-4876-85b3-4b2141708acb} - Desktop 531 default + Desktop 541 GCC false @@ -188,12 +189,12 @@ ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371} - 13 + 15 :///DESKTOP/// - {8ca91e21-c12e-4876-85b3-4b2141708acb} + {542217c7-ce0f-48f7-843b-d4fad339688d} - Desktop 541 GCC + Desktop 561 default false @@ -204,7 +205,7 @@ Profile.Default - {17ae70be-817d-4019-9337-fa7761c4b0ed} + {e91398ba-6443-4b02-b416-782a70d9df90} Version diff --git a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml index ce7e0515a4..df6caa8842 100644 --- a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml @@ -1,6 +1,6 @@ - + QtVersion.0 @@ -55,9 +55,9 @@ QtVersion.5 - 9 - Desktop Qt 5.2.1 (SQUISH_DEFAULT_COMPILER) - ~/Qt5.2.1/5.2.1/SQUISH_DEFAULT_COMPILER/bin/qmake + 11 + Qt 5.3.1 (SQUISH_DEFAULT_COMPILER) + ~/Qt5.3.1/5.3/SQUISH_DEFAULT_COMPILER/bin/qmake Qt4ProjectManager.QtVersion.Desktop false @@ -65,9 +65,9 @@ QtVersion.6 - 11 - Qt 5.3.1 (SQUISH_DEFAULT_COMPILER) - ~/Qt5.3.1/5.3/SQUISH_DEFAULT_COMPILER/bin/qmake + 13 + Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER) + ~/Qt5.4.1/5.4/SQUISH_DEFAULT_COMPILER/bin/qmake Qt4ProjectManager.QtVersion.Desktop false @@ -75,9 +75,9 @@ QtVersion.7 - 13 + 15 Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER) - ~/Qt5.4.1/5.4/SQUISH_DEFAULT_COMPILER/bin/qmake + ~/Qt5.6.1/5.6/SQUISH_DEFAULT_COMPILER/bin/qmake Qt4ProjectManager.QtVersion.Desktop false diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml index 85edff2f66..ace7dc6199 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml @@ -1,6 +1,6 @@ - + Profile.0 @@ -147,19 +147,19 @@ - {811977c9-ea95-4616-bc28-c66d1935ff65} + {2f8a1f59-ddd7-49f0-ae61-1337223f56a3} Desktop Device Desktop - ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2} + ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb} - 4 + 22 :///DESKTOP/// - {11e4aad3-9fa6-48a2-93f5-829471bfda32} + {10cf33c5-e36d-4a49-a8c7-086f3cf59695} - Desktop 521 default + Desktop 541 GCC false @@ -171,19 +171,19 @@ - {2f8a1f59-ddd7-49f0-ae61-1337223f56a3} + {811977c9-ea95-4616-bc28-c66d1935ff65} Desktop Device Desktop - ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb} + {7ca0887f-a9a5-4251-aba6-560a15595d20} - 22 + 24 :///DESKTOP/// - {10cf33c5-e36d-4a49-a8c7-086f3cf59695} + {f9c7858c-d167-4b78-847a-91943bd0af07} - Desktop 541 GCC + Desktop 561 default false @@ -194,7 +194,7 @@ Profile.Default - {11e4aad3-9fa6-48a2-93f5-829471bfda32} + {6a95566e-8372-4372-8286-ef73af7de191} Version diff --git a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml index 66d48d5f94..a517d266d5 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml @@ -1,6 +1,6 @@ - + QtVersion.0 @@ -55,9 +55,9 @@ QtVersion.5 - 4 - Desktop Qt 5.2.1 (msvc2010) - C:/Qt/Qt5.2.1/5.2.1/msvc2010/bin/qmake.exe + 20 + Qt 5.3.1 (msvc2010_opengl) + C:/Qt/Qt5.3.1/5.3/msvc2010_opengl/bin/qmake.exe Qt4ProjectManager.QtVersion.Desktop false @@ -65,9 +65,9 @@ QtVersion.6 - 20 - Qt 5.3.1 (msvc2010_opengl) - C:/Qt/Qt5.3.1/5.3/msvc2010_opengl/bin/qmake.exe + 22 + Qt %{Qt:Version} (mingw491_32) + C:/Qt/Qt5.4.1/5.4/mingw491_32/bin/qmake.exe Qt4ProjectManager.QtVersion.Desktop false @@ -75,9 +75,9 @@ QtVersion.7 - 22 - Qt %{Qt:Version} (mingw491_32) - C:/Qt/Qt5.4.1/5.4/mingw491_32/bin/qmake.exe + 24 + Qt %{Qt:Version} (msvc2013) + C:/Qt/Qt5.6.1/5.6/msvc2013/bin/qmake.exe Qt4ProjectManager.QtVersion.Desktop false diff --git a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml index f87f81d9a5..027bed7ed1 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml @@ -1,6 +1,6 @@ - + ToolChain.0 @@ -69,9 +69,20 @@ ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb} + + ToolChain.5 + + x86-windows-msvc2013-pe-32bit + C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat + x86 + true + Microsoft Visual C++ Compiler 12.0 (x86) + ProjectExplorer.ToolChain.Msvc:{7ca0887f-a9a5-4251-aba6-560a15595d20} + + ToolChain.Count - 5 + 6 Version diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index 2e9b0bebae..b8e02f5663 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -34,11 +34,9 @@ class Targets: DESKTOP_480_DEFAULT, SIMULATOR, EMBEDDED_LINUX, - DESKTOP_521_DEFAULT, DESKTOP_531_DEFAULT, - DESKTOP_541_GCC) = ALL_TARGETS - - DESKTOP_561_DEFAULT = sum(ALL_TARGETS) + 1 + DESKTOP_541_GCC, + DESKTOP_561_DEFAULT) = ALL_TARGETS @staticmethod def desktopTargetClasses(): @@ -65,8 +63,6 @@ class Targets: return "Qt Simulator" elif target == Targets.EMBEDDED_LINUX: return "Embedded Linux" - elif target == Targets.DESKTOP_521_DEFAULT: - return "Desktop 521 default" elif target == Targets.DESKTOP_531_DEFAULT: return "Desktop 531 default" elif target == Targets.DESKTOP_541_GCC: @@ -96,7 +92,7 @@ class Targets: @staticmethod def getDefaultKit(): - return Targets.DESKTOP_521_DEFAULT + return Targets.DESKTOP_531_DEFAULT # this class holds some constants for easier usage inside the Projects view class ProjectSettings: @@ -182,7 +178,7 @@ class Qt5Path: @staticmethod def getPaths(pathSpec): - qt5targets = [Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT] + qt5targets = [Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_561_DEFAULT] if platform.system() != 'Darwin': qt5targets.append(Targets.DESKTOP_541_GCC) if pathSpec == Qt5Path.DOCS: @@ -196,10 +192,7 @@ class Qt5Path: @staticmethod def __preCheckAndExtractQtVersionStr__(target): if target not in Targets.ALL_TARGETS: - # Ignore DESKTOP_561_DEFAULT which only delivers examples but not a kit yet. - # Remove the condition as soon as it is being used as a kit in tests. - if not target == Targets.DESKTOP_561_DEFAULT: - raise Exception("Unexpected target '%s'" % str(target)) + raise Exception("Unexpected target '%s'" % str(target)) matcher = re.match("^Desktop (5\\d{2}).*$", Targets.getStringForTarget(target)) if matcher is None: diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index d5cf7030aa..3eba7a13d6 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -629,7 +629,9 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): version = res.group("version") else: version = None - if 'Supported Platforms' in text: + if 'only available with Qt 5.6' in text: + result = [Targets.DESKTOP_561_DEFAULT] + elif 'Supported Platforms' in text: supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ") result = [] if 'Desktop' in supports: @@ -638,7 +640,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): result.append(Targets.DESKTOP_480_DEFAULT) if platform.system() in ("Linux", "Darwin"): result.append(Targets.EMBEDDED_LINUX) - result.extend([Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT]) + result.extend([Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_561_DEFAULT]) if platform.system() != 'Darwin': result.append(Targets.DESKTOP_541_GCC) if not templateName == "Qt Creator Plugin" and (version == None or version < "5.0"): diff --git a/tests/system/suite_editors/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py index 70f56ea14d..7f3fedb513 100644 --- a/tests/system/suite_editors/tst_qml_editor/test.py +++ b/tests/system/suite_editors/tst_qml_editor/test.py @@ -26,7 +26,7 @@ source("../../shared/qtcreator.py") def main(): - target = Targets.DESKTOP_521_DEFAULT + target = Targets.DESKTOP_531_DEFAULT sourceExample = os.path.join(Qt5Path.examplesPath(target), "declarative/keyinteraction/focus") proFile = "focus.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index f9ddd3bcc3..44846f4fdf 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -29,7 +29,7 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - available = [("5.3", False), ("5.3", True)] + available = [("5.6", False), ("5.6", True)] if platform.system() != 'Darwin': available.extend([("5.4", False), ("5.4", True)]) @@ -39,9 +39,9 @@ def main(): projectName = createNewQtQuickUI(workingDir, qtVersion, controls) switchViewTo(ViewConstants.PROJECTS) clickButton(waitForObject(":*Qt Creator.Add Kit_QPushButton")) - if qtVersion == "5.3": - menuItem = Targets.getStringForTarget(Targets.DESKTOP_531_DEFAULT) - quick = "2.3" + if qtVersion == "5.6": + menuItem = Targets.getStringForTarget(Targets.DESKTOP_561_DEFAULT) + quick = "2.6" else: menuItem = Targets.getStringForTarget(Targets.DESKTOP_541_GCC) quick = "2.4" diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py index 54c7e25772..99cccb8cd2 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py @@ -29,7 +29,7 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - for targ, quickVer in [[Targets.DESKTOP_480_DEFAULT, 1], [Targets.DESKTOP_521_DEFAULT, 2], + for targ, quickVer in [[Targets.DESKTOP_480_DEFAULT, 1], [Targets.DESKTOP_561_DEFAULT, 2], [Targets.DESKTOP_531_DEFAULT, 2]]: # using a temporary directory won't mess up a potentially existing createNewQmlExtension(tempDir(), targ, quickVer) -- cgit v1.2.1 From b4bb1e97b8bb2abfd8360c4d8315940791a893a8 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 27 Jul 2016 00:06:19 +0200 Subject: QmlDesigner.StatesEditor: Themed borders Use the typical theme color role for border.color in the state items and "+" button. Change-Id: Id87180deeff8c69da2bacf541484482a2cd4d380 Reviewed-by: Thomas Hartmann --- share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml | 3 ++- share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml index 07944f7699..323eaf17c3 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml @@ -37,6 +37,7 @@ Rectangle { property int delegateStateImageSize color: baseColor + border.color: creatorTheme.QmlDesignerBackgroundColorDarker MouseArea { anchors.fill: parent @@ -117,7 +118,7 @@ Rectangle { anchors.margins: -1 anchors.fill: stateImage border.width: 1 - border.color: "#000000" + border.color: creatorTheme.QmlDesignerBackgroundColorDarker } Image { id: stateImage diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml index 57f7efe365..099e76ad3f 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml @@ -111,6 +111,7 @@ FocusScope { background: Rectangle { property color buttonBaseColor: Qt.darker(creatorTheme.QmlDesignerBackgroundColorDarkAlternate, 1.1) color: control.hovered ? Qt.lighter(buttonBaseColor, 1.2) : buttonBaseColor + border.color: creatorTheme.QmlDesignerBackgroundColorDarker border.width: 1 Image { source: "image://icons/plus" -- cgit v1.2.1 From 66c589f9ca21fb2661a580388897f21d77cf356e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 27 Jul 2016 11:44:05 +0200 Subject: QmlDesigner.ItemLibrary: Adding support for StackLayout The StackLayout is working and it makes sense to add it to the item library. Change-Id: I732398a25091f2a33f38c42f5bf1c55ef9dac237 Reviewed-by: Alessandro Portale --- .../qmldesigner/componentsplugin/components.metainfo | 16 ++++++++++++++++ .../qmldesigner/componentsplugin/componentsplugin.qrc | 2 ++ .../componentsplugin/images/stack-layouts-icon-16px.png | Bin 0 -> 147 bytes .../componentsplugin/images/stack-layouts-icon.png | Bin 0 -> 157 bytes 4 files changed, 18 insertions(+) create mode 100644 src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png create mode 100644 src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/components.metainfo b/src/plugins/qmldesigner/componentsplugin/components.metainfo index 01da4319f9..22f782038b 100644 --- a/src/plugins/qmldesigner/componentsplugin/components.metainfo +++ b/src/plugins/qmldesigner/componentsplugin/components.metainfo @@ -342,6 +342,22 @@ MetaInfo { } } +Type { + name: "QtQuick.Layouts.StackLayout" + icon: ":/componentsplugin/images/stack-layouts-icon-16px.png" + + ItemLibraryEntry { + name: "StackLayout" + category: "Qt Quick - Layouts" + libraryIcon: ":/componentsplugin/images/stack-layouts-icon.png" + version: "1.3" + requiredImport: "QtQuick.Layouts" + + Property { name: "width"; type: "int"; value: 100; } + Property { name: "height"; type: "int"; value: 100; } + } +} + Type { name: "QtQuick.Controls.TabView" icon: ":/componentsplugin/images/window16.png" diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc index dcc5f6eccf..3a8361e20b 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc @@ -43,6 +43,8 @@ images/row-layouts-icon-16px.png images/splitview-layouts-icon.png images/splitview-layouts-icon-16px.png + images/stack-layouts-icon.png + images/stack-layouts-icon-16px.png Controls/ButtonSpecifics.qml diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png new file mode 100644 index 0000000000..3f7ab00c1d Binary files /dev/null and b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png new file mode 100644 index 0000000000..bbd6783cc5 Binary files /dev/null and b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png differ -- cgit v1.2.1 From 351919a1bfa51f2fb898aa71fe73b3c700cd7885 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 27 Jul 2016 11:47:19 +0200 Subject: ClangStaticAnalyzer: Do not try to determine version of clang-cl.exe It does not understand "--version". Use clang.exe for the version check. Change-Id: I64a46e8e2e5be47ad6f13c9c5497264e1128a22a Reviewed-by: Christian Kandeler --- .../clangstaticanalyzerruncontrol.cpp | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index 22b9f86702..77f596ddb3 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -446,6 +446,21 @@ static Core::Id toolchainType(ProjectExplorer::RunConfiguration *runConfiguratio return ToolChainKitInformation::toolChain(runConfiguration->target()->kit())->typeId(); } +static QString executableForVersionCheck(Core::Id toolchainType, const QString &executable) +{ + if (toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) { + const QString suffix = QLatin1String("-cl.exe"); + if (executable.endsWith(suffix, Utils::HostOsInfo::fileNameCaseSensitivity())) { + QString modified = executable; + modified.chop(suffix.length()); + modified.append(QLatin1String(".exe")); + return modified; + } + } + + return executable; +} + void ClangStaticAnalyzerRunControl::start() { m_success = false; @@ -458,7 +473,8 @@ void ClangStaticAnalyzerRunControl::start() // Check clang executable bool isValidClangExecutable; - const QString executable = clangExecutableFromSettings(toolchainType(runConfiguration()), + const Core::Id theToolchainType = toolchainType(runConfiguration()); + const QString executable = clangExecutableFromSettings(theToolchainType, &isValidClangExecutable); if (!isValidClangExecutable) { const QString errorMessage = tr("Clang Static Analyzer: Invalid executable \"%1\", stop.") @@ -471,12 +487,13 @@ void ClangStaticAnalyzerRunControl::start() } // Check clang version - const ClangExecutableVersion version = clangExecutableVersion(executable); + const QString versionCheckExecutable = executableForVersionCheck(theToolchainType, executable); + const ClangExecutableVersion version = clangExecutableVersion(versionCheckExecutable); if (!version.isValid()) { const QString warningMessage = tr("Clang Static Analyzer: Running with possibly unsupported version, " "could not determine version from executable \"%1\".") - .arg(executable); + .arg(versionCheckExecutable); appendMessage(warningMessage + QLatin1Char('\n'), Utils::StdErrFormat); TaskHub::addTask(Task::Warning, warningMessage, Debugger::Constants::ANALYZERTASK_ID); TaskHub::requestPopup(); -- cgit v1.2.1 From fc792d0218e534a74d986dcdee864c5f5b62296e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 27 Jul 2016 14:18:06 +0200 Subject: QmlDesigner.PropertyEditor: Align reset button Change-Id: I05fd4f6a2cc668a5ec65919b1ef83bea117a7789 Reviewed-by: Alessandro Portale --- .../HelperWidgets/AligmentHorizontalButtons.qml | 3 ++- .../propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml | 3 ++- .../propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml index 7e777ec678..af29773ce2 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml @@ -30,10 +30,11 @@ Row { id: alignmentHorizontalButtons RoundedPanel { - width: 14 + width: 16 height: parent.height roundLeft: true ExtendedFunctionButton { + x: 2 anchors.verticalCenter: parent.verticalCenter backendValue: alignmentHorizontalButtons.backendValue } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml index b36d93656c..ac3bd20f35 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml @@ -30,11 +30,12 @@ Row { id: alignmentVerticalButtons RoundedPanel { - width: 14 + width: 16 height: parent.height roundLeft: true ExtendedFunctionButton { + x: 2 anchors.verticalCenter: parent.verticalCenter backendValue: alignmentVerticalButtons.backendValue } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml index adad22f083..28ebab1804 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml @@ -83,7 +83,7 @@ ButtonRowButton { ExtendedFunctionButton { backendValue: boolButtonRowButton.backendValue - x: 0 + x: 2 y: 4 } } -- cgit v1.2.1 From 2ab466ea046e065ec978358cc7b4435d9147cbce Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 26 Jul 2016 16:35:45 +0200 Subject: Doc: Describe model and state chart wizards Add the Qt SCXML index file to be able to link to the module docs. Change-Id: Ibd28071cdc3c98c07fb91c73732d809ffed5333b Reviewed-by: Ulf Hermann --- doc/config/qtcreator-project.qdocconf | 1 + doc/src/projects/creator-projects-creating.qdoc | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index 50986a4c4b..9fa6d3167d 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -42,6 +42,7 @@ indexes += $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \ $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \ $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \ $QDOC_INDEX_DIR/qtscript/qtscript.index \ + $QDOC_INDEX_DIR/qtscxml/qtscxml.index \ $QDOC_INDEX_DIR/qtsensors/qtsensors.index \ $QDOC_INDEX_DIR/qttestlib/qttestlib.index \ $QDOC_INDEX_DIR/qtuitools/qtuitools.index \ diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 91becd0bd5..29bc9b1bd7 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -314,6 +314,23 @@ \endlist + \li Models and state charts + + \list + + \li Universal Modeling Language (UML) style models with structured + diagrams. However, the model editor uses a variant of UML and + provides only a subset of properties for specifying the + appearance of model elements. For more information, see + \l {Modeling}. + + \li State Chart XML (SCXML) files that contain boilerplate code for + state machines. You can use the classes in the \l {Qt SCXML} + module to embed state machines created from the files in Qt + applications. + + \endlist + \li GLSL GLSL files that define fragment and vertex shaders in both Qt Quick -- cgit v1.2.1 From bce5aca625919687535d2355ede192ac5c0ae0c0 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 27 Jul 2016 16:34:20 +0200 Subject: Doc: Update Git docs - Fix paths to functions - Describe Reset button in Branches dialog - Update screenshot Change-Id: I873921a8ee0d4ec6e3572be01e5c59e51adb7a0a Reviewed-by: Orgad Shaneh --- doc/images/qtcreator-vcs-gitbranch.png | Bin 33156 -> 14795 bytes doc/src/howto/creator-vcs.qdoc | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/images/qtcreator-vcs-gitbranch.png b/doc/images/qtcreator-vcs-gitbranch.png index beb0a9e8ba..26b3a3992a 100644 Binary files a/doc/images/qtcreator-vcs-gitbranch.png and b/doc/images/qtcreator-vcs-gitbranch.png differ diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index 30f26e26a1..0967170356 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -481,7 +481,8 @@ \section4 Working with Branches - To work with Git branches, select \uicontrol{Branches}. The checked out branch + To work with Git branches, select \uicontrol Tools > \uicontrol Git > + \uicontrol {Local Repository} > \uicontrol {Branches}. The checked out branch is shown in bold and underlined in the list of branches. Double-click branch names to edit them. @@ -528,6 +529,9 @@ \row \li \uicontrol Rebase \li Copy local commits to the updated upstream head. + \row + \li \uicontrol Reset + \li Hard reset the active branch to the selected branch. \row \li \uicontrol {Cherry Pick} \li Cherry pick the top commit from the selected branch. @@ -540,7 +544,8 @@ Patches are rewriting instructions that can be applied to a set of files. To apply a patch file that is open in \QC, select \uicontrol Tools > \uicontrol Git > - \uicontrol {Local Repository} > \uicontrol {Apply from Editor}. + \uicontrol {Local Repository} > \uicontrol Patch > + \uicontrol {Apply from Editor}. To select the patch file to apply from the file system, select \uicontrol {Apply from File}. -- cgit v1.2.1 From 659b0b47883da1dbd5496185853bbbc0f0bdc1d0 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 27 Jul 2016 15:51:20 +0200 Subject: Android: Add context objects for QObject::connect with functors If several threads can be involved in the signal/slot exchange we need to show the receiver objects to connect() so that the signals can be queued when necessary. Change-Id: I24b4fe90095ce10eeeff9618faff97bd9d05c6eb Reviewed-by: BogDan Vatra --- src/plugins/android/androidanalyzesupport.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp index e64b839969..0c859c8f19 100644 --- a/src/plugins/android/androidanalyzesupport.cpp +++ b/src/plugins/android/androidanalyzesupport.cpp @@ -72,35 +72,35 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig, auto runner = new AndroidRunner(this, runConfig, runControl->runMode()); - connect(runControl, &AnalyzerRunControl::finished, + connect(runControl, &AnalyzerRunControl::finished, runner, [runner]() { runner->stop(); }); - connect(runControl, &AnalyzerRunControl::starting, + connect(runControl, &AnalyzerRunControl::starting, runner, [runner]() { runner->start(); }); - connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort, + connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort, this, [this, runControl](Utils::Port) { runControl->notifyRemoteSetupDone(m_qmlPort); }); - connect(runner, &AndroidRunner::remoteProcessStarted, + connect(runner, &AndroidRunner::remoteProcessStarted, this, [this](Utils::Port, Utils::Port qmlPort) { m_qmlPort = qmlPort; }); - connect(runner, &AndroidRunner::remoteProcessFinished, + connect(runner, &AndroidRunner::remoteProcessFinished, this, [this, runControl](const QString &errorMsg) { runControl->notifyRemoteFinished(); runControl->appendMessage(errorMsg, Utils::NormalMessageFormat); }); - connect(runner, &AndroidRunner::remoteErrorOutput, + connect(runner, &AndroidRunner::remoteErrorOutput, this, [this, runControl](const QString &msg) { runControl->appendMessage(msg, Utils::StdErrFormatSameLine); m_outputParser.processOutput(msg); }); - connect(runner, &AndroidRunner::remoteOutput, + connect(runner, &AndroidRunner::remoteOutput, this, [this, runControl](const QString &msg) { runControl->appendMessage(msg, Utils::StdOutFormatSameLine); m_outputParser.processOutput(msg); -- cgit v1.2.1 From 4bdd1ffbf7aa315e6e2a3298b7934b4f16d2a1fd Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 27 Jul 2016 18:25:06 +0200 Subject: Themes: Enable using the original Window color for toolbars This patch adds a flag which enables the "fancy" side/tool/status bars to use the original Window color from the application palette. The flag is disabled for all themes by default. Task-number: QTCREATORBUG-16331 Change-Id: I1433e865e1903012d521a2cdb7083f110086e455 Reviewed-by: Thomas Hartmann --- share/qtcreator/themes/dark.creatortheme | 1 + share/qtcreator/themes/default.creatortheme | 1 + share/qtcreator/themes/flat-dark.creatortheme | 1 + share/qtcreator/themes/flat-light.creatortheme | 1 + share/qtcreator/themes/flat.creatortheme | 1 + src/libs/utils/stylehelper.cpp | 6 ++++++ src/libs/utils/theme/theme.h | 3 ++- 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 1963587a2b..546827ee1d 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -216,6 +216,7 @@ FlatSideBarIcons=true FlatProjectsMode=true FlatMenuBar=true ToolBarIconShadow=true +WindowColorAsBase=false [Gradients] DetailsWidgetHeaderGradient\1\color=0 diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index da10636a8f..ceb0f39f43 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -187,6 +187,7 @@ FlatSideBarIcons=false FlatProjectsMode=false FlatMenuBar=false ToolBarIconShadow=true +WindowColorAsBase=false [Gradients] DetailsWidgetHeaderGradient\1\color=ffffff diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index 820b7fa887..d2e194dd3f 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -221,6 +221,7 @@ FlatSideBarIcons=true FlatProjectsMode=true FlatMenuBar=true ToolBarIconShadow=true +WindowColorAsBase=false [Gradients] DetailsWidgetHeaderGradient\1\color=0 diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index 6c8d65440a..f801f9eaa5 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -198,6 +198,7 @@ FlatSideBarIcons=true FlatProjectsMode=false FlatMenuBar=false ToolBarIconShadow=false +WindowColorAsBase=false [Gradients] DetailsWidgetHeaderGradient\1\color=0 diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index 2f49efef57..285bc9c99c 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -197,6 +197,7 @@ FlatSideBarIcons=true FlatProjectsMode=false FlatMenuBar=false ToolBarIconShadow=true +WindowColorAsBase=false [Gradients] DetailsWidgetHeaderGradient\1\color=0 diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index 1dfe1d89dd..78d20c55db 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -114,6 +114,12 @@ QColor StyleHelper::m_requestedBaseColor; QColor StyleHelper::baseColor(bool lightColored) { + static const bool windowColorAsBase = creatorTheme()->flag(Theme::WindowColorAsBase); + if (windowColorAsBase) { + static const QColor windowColor = QApplication::palette().color(QPalette::Window); + return windowColor; + } + if (!lightColored) return m_baseColor; else diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index a32e7b0553..dd2eac9a0d 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -326,7 +326,8 @@ public: FlatSideBarIcons, FlatProjectsMode, FlatMenuBar, - ToolBarIconShadow + ToolBarIconShadow, + WindowColorAsBase }; bool flag(Flag f) const; -- cgit v1.2.1 From 80ca67e43fea432e58305b31c552d31306ac352f Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 28 Jul 2016 10:25:51 +0200 Subject: StyleHelper: Fixing alphaBlendedColors Change-Id: Ib2f5e37e213e221ecfcce876ed2f44013815ca46 Reviewed-by: Alessandro Portale --- src/libs/utils/stylehelper.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index 78d20c55db..088b7ff515 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -66,14 +66,14 @@ QColor StyleHelper::mergedColors(const QColor &colorA, const QColor &colorB, int QColor StyleHelper::alphaBlendedColors(const QColor &colorA, const QColor &colorB) { - const QRgb base = colorA.rgba(); - const QRgb overlay = colorB.rgba(); - const qreal overlayIntensity = qAlpha(overlay) / 255.0; - return qRgba( - qMin(qRed(base) + qRound(qRed(overlay) * overlayIntensity), 0xff), - qMin(qGreen(base) + qRound(qGreen(overlay) * overlayIntensity), 0xff), - qMin(qBlue(base) + qRound(qBlue(overlay) * overlayIntensity), 0xff), - qMin(qAlpha(base) + qAlpha(overlay), 0xff)); + const int alpha = colorB.alpha(); + const int antiAlpha = 255 - alpha; + + return QColor( + (colorA.red() * antiAlpha + colorB.red() * alpha) / 255, + (colorA.green() * antiAlpha + colorB.green() * alpha) / 255, + (colorA.blue() * antiAlpha + colorB.blue() * alpha) / 255 + ); } qreal StyleHelper::sidebarFontSize() -- cgit v1.2.1 From 8c42cd9e23ee3be7d757960be95678f9743a5ed7 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 27 Jul 2016 14:48:16 +0200 Subject: AutoTest: Fix retrieval of executable Respect different location if tests are installed before executing. Task-number: QTCREATORBUG-16638 Change-Id: I2d154e26cdd0f28bd51e7a885c5486d36af38a68 Reviewed-by: Christian Kandeler --- src/plugins/autotest/testconfiguration.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index 0e92789ae3..1082594009 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/src/plugins/autotest/testconfiguration.cpp @@ -151,7 +151,12 @@ void TestConfiguration::completeTestInformation(int runMode) Runnable runnable = rc->runnable(); if (isLocal(rc) && runnable.is()) { StandardRunnable stdRunnable = runnable.as(); - if (stdRunnable.executable == targetFile) { + // we might have an executable that gets installed - in such a case the + // runnable's executable and targetFile won't match - but the (unique) display name + // of the run configuration should match targetName + if (stdRunnable.executable == targetFile + || (!targetName.isEmpty() && rc->displayName() == targetName)) { + targetFile = stdRunnable.executable; workDir = Utils::FileUtils::normalizePathName(stdRunnable.workingDirectory); env = stdRunnable.environment; hasDesktopTarget = true; -- cgit v1.2.1 From 876ec5996ce16e58702d1d0ff3f0285aad54e78b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 27 Jul 2016 14:39:36 +0200 Subject: QmlDesigner.FormEditor: Adjust CSS for LineEdit Change-Id: I7d4fbb3c16747f6d2b290db18b7c48b63a23bdd3 Reviewed-by: Alessandro Portale --- .../qmldesigner/components/resources/formeditorstylesheet.css | 9 +++++++++ src/plugins/qmldesigner/components/resources/stylesheet.css | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css index f11a2a42d4..1ab3cf047f 100644 --- a/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css +++ b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css @@ -14,3 +14,12 @@ QGraphicsView:focus { background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate; } +QLineEdit +{ + color: creatorTheme.PanelTextColorLight; + border: 1px solid creatorTheme.QmlDesignerBackgroundColorDarker; + padding: 2px 8px; + margin: 2px; + background-color: creatorTheme.FancyToolButtonSelectedColor; + selection-background-color: darkgray; +} diff --git a/src/plugins/qmldesigner/components/resources/stylesheet.css b/src/plugins/qmldesigner/components/resources/stylesheet.css index 15de3f502f..126ac51b29 100644 --- a/src/plugins/qmldesigner/components/resources/stylesheet.css +++ b/src/plugins/qmldesigner/components/resources/stylesheet.css @@ -37,14 +37,6 @@ QTabWidget::pane { /* The tab widget frame */ background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate; } -QLineEdit -{ - border: 2px solid #8F8F8F; - padding: 0 8px; - background-color: white; - selection-background-color: darkgray; -} - QLineEdit#itemLibrarySearchInput { color: creatorTheme.PanelTextColorLight; -- cgit v1.2.1 From b8a22a5ec1a9c974cafbef148077f3836c392b95 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 28 Jul 2016 12:28:43 +0200 Subject: QmlDesigner: Rework of theming colors * Use the original fancy toolbar colors by removing the Alpha channel. * Use the splitter colors for borders to avoid white borders in light themes. * Use the FancyToolButtonHoverColor for buttons and combo boxes. Change-Id: Id636e0713c8e2769c5eb03a115a60ccad8226f23 Reviewed-by: Alessandro Portale --- .../qmldesigner/common/DesignerScrollViewStyle.qml | 4 +-- .../itemLibraryQmlSources/ItemDelegate.qml | 4 +-- .../HelperWidgets/ButtonRowButton.qml | 2 +- .../HelperWidgets/CustomCheckBoxStyle.qml | 2 +- .../HelperWidgets/CustomComboBoxStyle.qml | 19 +++---------- .../HelperWidgets/CustomSpinBoxStyle.qml | 4 +-- .../HelperWidgets/LineEdit.qml | 10 +++---- .../HelperWidgets/RoundedPanel.qml | 8 +++--- .../statesEditorQmlSources/StatesDelegate.qml | 2 +- .../statesEditorQmlSources/StatesList.qml | 2 +- .../components/componentcore/theming.cpp | 32 ++++++++++++---------- .../qmldesigner/components/resources/scrollbar.css | 12 ++++---- 12 files changed, 46 insertions(+), 55 deletions(-) diff --git a/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml b/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml index ba826a424a..c7741be76f 100644 --- a/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml +++ b/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml @@ -29,8 +29,8 @@ import QtQuick.Controls.Styles 1.1 ScrollViewStyle { readonly property color scrollbarColor: creatorTheme.BackgroundColorDark - readonly property color scrollbarBorderColor: creatorTheme.QmlDesignerBackgroundColorDarker - readonly property color scrollBarHandleColor: creatorTheme.QmlDesignerBackgroundColorLighter + readonly property color scrollbarBorderColor: creatorTheme.QmlDesignerBorderColor + readonly property color scrollBarHandleColor: creatorTheme.QmlDesignerButtonColor padding {left: 0; top: 0; right: 0; bottom: 0} diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml index e32c19de79..cd046a65e3 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml @@ -28,9 +28,9 @@ import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.0 Rectangle { - color: creatorTheme.QmlDesignerBackgroundColorLighter + color: creatorTheme.QmlDesignerButtonColor - border.color: creatorTheme.BackgroundColorDark + border.color: creatorTheme.QmlDesignerBorderColor border.width: 1 diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml index ef134a1a55..ccaf16a06f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml @@ -78,7 +78,7 @@ Item { anchors.fill: parent visible: !checked - color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate + color: creatorTheme.QmlDesignerButtonColor } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml index 054c807ec4..b553c81d0d 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml @@ -38,7 +38,7 @@ CheckBoxStyle { color: control.pressed ? creatorTheme.FancyToolButtonHoverColor : creatorTheme.FancyToolButtonSelectedColor - border.color: creatorTheme.QmlDesignerBackgroundColorDarker + border.color: creatorTheme.QmlDesignerBorderColor anchors.margins: 1 } Image { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml index 680317bd8a..318f689a63 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml @@ -40,30 +40,19 @@ ComboBoxStyle { Rectangle { anchors.fill: parent visible: !control.pressed - color: creatorTheme.FancyToolButtonSelectedColor - border.color: creatorTheme.QmlDesignerBackgroundColorDarker + color: creatorTheme.QmlDesignerButtonColor + border.color: creatorTheme.QmlDesignerBorderColor border.width: 1 } Rectangle { - color: creatorTheme.FancyToolButtonHoverColor + color: creatorTheme.QmlDesignerBackgroundColorDarker anchors.fill: parent visible: control.pressed - border.color: creatorTheme.QmlDesignerBackgroundColorDarker + border.color: creatorTheme.QmlDesignerBorderColor border.width: 1 } - Rectangle { - color: creatorTheme.IconsBaseColor - width: 1 - anchors.right: imageItem.left - anchors.topMargin: 4 - anchors.bottomMargin: 4 - anchors.rightMargin: 6 - anchors.top: parent.top - anchors.bottom: parent.bottom - } - Image { id: imageItem width: 8 diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml index 82adcd00e4..e6f73eebb2 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml @@ -67,7 +67,7 @@ SpinBoxStyle { background: Rectangle { implicitWidth: Math.max(64, styleData.contentWidth) implicitHeight: 23 - color: creatorTheme.FancyToolButtonSelectedColor - border.color: creatorTheme.QmlDesignerBackgroundColorDarker + color: creatorTheme.QmlDesignerBackgroundColorDarker + border.color: creatorTheme.QmlDesignerBorderColor } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml index 56c651859b..6d9e86d23a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml @@ -118,8 +118,8 @@ Controls.TextField { background: Rectangle { implicitWidth: 100 implicitHeight: 24 - color: creatorTheme.FancyToolButtonSelectedColor - border.color: creatorTheme.QmlDesignerBackgroundColorDarker + color: creatorTheme.QmlDesignerBackgroundColorDarker + border.color: creatorTheme.QmlDesignerBorderColor } } @@ -172,10 +172,8 @@ Controls.TextField { y: 1 Rectangle { anchors.fill: parent - border.color: creatorTheme.QmlDesignerBackgroundColorDarker - color: control.pressed - ? creatorTheme.QmlDesignerBackgroundColorLighter - : creatorTheme.FancyToolButtonHoverColor + border.color: creatorTheme.QmlDesignerBorderColor + color: creatorTheme.QmlDesignerBackgroundColorDarker opacity: control.hovered || control.pressed ? 1 : 0.75 } Image { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml index 6f5afaa5a9..a0f3fe1796 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml @@ -43,8 +43,8 @@ Rectangle { */ border.width: roundLeft || roundRight ? 1 : 0 - color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate - border.color: creatorTheme.QmlDesignerBackgroundColorDarker + color: creatorTheme.QmlDesignerButtonColor + border.color: creatorTheme.QmlDesignerBorderColor Rectangle { anchors.fill: parent @@ -71,7 +71,7 @@ Rectangle { } Rectangle { - color: creatorTheme.QmlDesignerBackgroundColorDarker + color: creatorTheme.QmlDesignerBorderColor anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right @@ -81,7 +81,7 @@ Rectangle { } Rectangle { - color: creatorTheme.QmlDesignerBackgroundColorDarker + color: creatorTheme.QmlDesignerBorderColor anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: parent.right diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml index 323eaf17c3..209b6d478d 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml @@ -37,7 +37,7 @@ Rectangle { property int delegateStateImageSize color: baseColor - border.color: creatorTheme.QmlDesignerBackgroundColorDarker + border.color: creatorTheme.QmlDesignerBorderColor MouseArea { anchors.fill: parent diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml index 099e76ad3f..c9cc82ee32 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml @@ -111,7 +111,7 @@ FocusScope { background: Rectangle { property color buttonBaseColor: Qt.darker(creatorTheme.QmlDesignerBackgroundColorDarkAlternate, 1.1) color: control.hovered ? Qt.lighter(buttonBaseColor, 1.2) : buttonBaseColor - border.color: creatorTheme.QmlDesignerBackgroundColorDarker + border.color: creatorTheme.QmlDesignerBorderColor border.width: 1 Image { source: "image://icons/plus" diff --git a/src/plugins/qmldesigner/components/componentcore/theming.cpp b/src/plugins/qmldesigner/components/componentcore/theming.cpp index a096b9b51e..c2ba9b37d9 100644 --- a/src/plugins/qmldesigner/components/componentcore/theming.cpp +++ b/src/plugins/qmldesigner/components/componentcore/theming.cpp @@ -27,31 +27,31 @@ #include "qmldesignericonprovider.h" #include +#include #include namespace QmlDesigner { +QColor midtone(const QColor &a, const QColor &b) +{ + QColor alphaB = b; + alphaB.setAlpha(128); + return Utils::StyleHelper::alphaBlendedColors(a ,alphaB); +} + void Theming::insertTheme(QQmlPropertyMap *map) { const QVariantHash creatorTheme = Utils::creatorTheme()->values(); for (auto it = creatorTheme.constBegin(); it != creatorTheme.constEnd(); ++it) map->insert(it.key(), it.value()); - /* Custom Colors */ - - QColor darkerBackground = Utils::creatorTheme()->color(Utils::Theme::BackgroundColorDark); - - if (darkerBackground.value() < 40) - darkerBackground = darkerBackground.lighter(150); - - map->insert("QmlDesignerBackgroundColorDarker", darkerBackground.darker(120)); - map->insert("QmlDesignerBackgroundColorLighter", darkerBackground.lighter(140)); - - if (darkerBackground.value() < 100) - map->insert("QmlDesignerBackgroundColorDarkAlternate", darkerBackground.lighter(120)); - else - map->insert("QmlDesignerBackgroundColorDarkAlternate", darkerBackground.lighter(110)); + /* Define QmlDesigner colors and remove alpha channels */ + const QColor panelStatusBarBackgroundColor = Utils::creatorTheme()->color(Utils::Theme::PanelStatusBarBackgroundColor); + const QColor fancyToolButtonSelectedColor = Utils::creatorTheme()->color(Utils::Theme::FancyToolButtonSelectedColor); + const QColor darkerBackground = Utils::StyleHelper::alphaBlendedColors(panelStatusBarBackgroundColor, fancyToolButtonSelectedColor); + const QColor fancyToolButtonHoverColor = Utils::creatorTheme()->color(Utils::Theme::FancyToolButtonHoverColor); + const QColor buttonColor = Utils::StyleHelper::alphaBlendedColors(panelStatusBarBackgroundColor, fancyToolButtonHoverColor); Utils::creatorTheme()->color(Utils::Theme::PanelTextColorLight); QColor tabLight = Utils::creatorTheme()->color(Utils::Theme::PanelTextColorLight); @@ -64,8 +64,12 @@ void Theming::insertTheme(QQmlPropertyMap *map) tabDark = tabDark.darker(260); } + map->insert("QmlDesignerBackgroundColorDarker", darkerBackground); + map->insert("QmlDesignerBackgroundColorDarkAlternate", midtone(panelStatusBarBackgroundColor, buttonColor)); map->insert("QmlDesignerTabLight", tabLight); map->insert("QmlDesignerTabDark", tabDark); + map->insert("QmlDesignerButtonColor", buttonColor); + map->insert("QmlDesignerBorderColor", Utils::creatorTheme()->color(Utils::Theme::SplitterColor)); } QString Theming::replaceCssColors(const QString &input) diff --git a/src/plugins/qmldesigner/components/resources/scrollbar.css b/src/plugins/qmldesigner/components/resources/scrollbar.css index e55255fcb8..35606d21f6 100644 --- a/src/plugins/qmldesigner/components/resources/scrollbar.css +++ b/src/plugins/qmldesigner/components/resources/scrollbar.css @@ -1,18 +1,18 @@ QScrollBar:vertical { background-color: creatorTheme.BackgroundColorDark; - border: 1px solid creatorTheme.QmlDesignerBackgroundColorDarker; + border: 1px solid creatorTheme.QmlDesignerBorderColor; margin-top: 3; margin-bottom: 3; width: 10; } QScrollBar::handle:vertical { - background-color: creatorTheme.QmlDesignerBackgroundColorLighter; + background-color: creatorTheme.QmlDesignerButtonColor; margin-top: -5; margin-bottom: -5; min-height: 18px; width: 8px; - border: 1px solid creatorTheme.QmlDesignerBackgroundColorDarker; + border: 1px solid creatorTheme.QmlDesignerBorderColor; border-width: 1; margin-left: -1; margin-right: -1; @@ -45,20 +45,20 @@ QScrollBar:horizontal { background-color: creatorTheme.BackgroundColorDark; - border: 1px solid creatorTheme.QmlDesignerBackgroundColorDarker; + border: 1px solid creatorTheme.QmlDesignerBorderColor; margin-left: 3; margin-right: 3; height: 10; } QScrollBar::handle:horizontal { - background-color: creatorTheme.QmlDesignerBackgroundColorLighter; + background-color: creatorTheme.QmlDesignerButtonColor; margin-left: -5; margin-right: -5; min-width: 18px; height: 8px; - border: 1px solid creatorTheme.QmlDesignerBackgroundColorDarker; + border: 1px solid creatorTheme.QmlDesignerBorderColor; border-width: 1; margin-top: -1; margin-bottom: -1; -- cgit v1.2.1 From dd2d17ed36e8f7c9ade33a31c688a4b974e12071 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 28 Jul 2016 10:14:31 +0200 Subject: QmlDesigner.FormEditor: Do not overwrite auxiliaryData width/height We using F2/goto into component the auxiliaryData is typically already set. Change-Id: Ib201198f5fcd7a716fb416b54537488cc5b68afc Reviewed-by: Alessandro Portale --- src/plugins/qmldesigner/components/formeditor/formeditorview.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 1e3f09fac2..8e8c996793 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -424,8 +424,10 @@ void FormEditorView::instanceInformationsChange(const QMultiHashupdateActions(); } else { -- cgit v1.2.1 From c7ba291c68bc97f7236e93d6c0235a6a66db5b48 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 27 Jul 2016 11:30:35 +0200 Subject: QmlDesigner.ItemLibrary: Adding logging category This makes it possible to debug the .metainfo files in a release build/package. Change-Id: Iceae98b0e00b9d4deba0ae3f31b1f55fca2c5cf2 Reviewed-by: Alessandro Portale --- .../components/itemlibrary/itemlibrarymodel.cpp | 39 +++++++++++++++------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index f68f520e20..08e65c847b 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -36,11 +36,14 @@ #include #include +#include #include #include #include #include +static Q_LOGGING_CATEGORY(itemlibraryPopulate, "itemlibrary.populate") + static bool inline registerItemLibrarySortedModel() { qmlRegisterType(); return true; @@ -150,23 +153,35 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model) if (import.isLibraryImport()) imports << import.url() + QLatin1Char(' ') + import.version(); + + qCInfo(itemlibraryPopulate) << Q_FUNC_INFO; foreach (ItemLibraryEntry entry, itemLibraryInfo->entries()) { - NodeMetaInfo metaInfo = model->metaInfo(entry.typeName()); - bool valid = metaInfo.isValid() && metaInfo.majorVersion() == entry.majorVersion(); - bool isItem = valid && metaInfo.isSubclassOf("QtQuick.Item"); + qCInfo(itemlibraryPopulate) << entry.typeName() << entry.majorVersion() << entry.minorVersion(); + + NodeMetaInfo metaInfo = model->metaInfo(entry.typeName()); + + qCInfo(itemlibraryPopulate) << "valid: " << metaInfo.isValid() << metaInfo.majorVersion() << metaInfo.minorVersion(); - if (!isItem && valid) { - qDebug() << Q_FUNC_INFO; - qDebug() << metaInfo.typeName() << "is not a QtQuick.Item"; - qDebug() << Utils::transform(metaInfo.superClasses(), &NodeMetaInfo::typeName); - } + bool valid = metaInfo.isValid() && metaInfo.majorVersion() == entry.majorVersion(); + bool isItem = valid && metaInfo.isSubclassOf("QtQuick.Item"); + + qCInfo(itemlibraryPopulate) << "isItem: " << isItem; + + qCInfo(itemlibraryPopulate) << "required import: " << entry.requiredImport() << entryToImport(entry).toImportString(); + + if (!isItem && valid) { + qDebug() << Q_FUNC_INFO; + qDebug() << metaInfo.typeName() << "is not a QtQuick.Item"; + qDebug() << Utils::transform(metaInfo.superClasses(), &NodeMetaInfo::typeName); + } - if (valid - && isItem //We can change if the navigator does support pure QObjects - && (entry.requiredImport().isEmpty() - || model->hasImport(entryToImport(entry), true, true))) { + if (valid + && isItem //We can change if the navigator does support pure QObjects + && (entry.requiredImport().isEmpty() + || model->hasImport(entryToImport(entry), true, true))) { QString itemSectionName = entry.category(); + qCInfo(itemlibraryPopulate) << "Adding:" << entry.typeName() << "to:" << entry.category(); ItemLibrarySection *sectionModel = sectionByName(itemSectionName); if (sectionModel == 0) { -- cgit v1.2.1 From 638279cc98d1d4262aa38b5223809c9519ad17bd Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 28 Jul 2016 12:33:07 +0200 Subject: QmlDesigner.PropertyEditor: Unify size of controls Change-Id: I375396ada5f394247346c3a66319796295894641 Reviewed-by: Alessandro Portale --- .../propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml | 2 +- .../qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml | 1 + .../qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml | 2 +- .../propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml | 2 +- .../propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml | 4 ++-- .../propertyEditorQmlSources/HelperWidgets/FontComboBox.qml | 2 +- .../qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml | 2 +- .../qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml index 28ebab1804..2b413caaef 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml @@ -84,6 +84,6 @@ ButtonRowButton { ExtendedFunctionButton { backendValue: boolButtonRowButton.backendValue x: 2 - y: 4 + anchors.verticalCenter: parent.verticalCenter } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml index 263e154bf0..d69490d53a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml @@ -39,6 +39,7 @@ Controls.CheckBox { ExtendedFunctionButton { x: 22 + anchors.verticalCenter: parent.verticalCenter backendValue: checkBox.backendValue visible: checkBox.enabled } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml index 8f98203271..08f76b4f25 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml @@ -112,7 +112,7 @@ Controls.ComboBox { ExtendedFunctionButton { x: 2 - y: 6 + anchors.verticalCenter: parent.verticalCenter backendValue: comboBox.backendValue visible: comboBox.enabled } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml index 318f689a63..97d10c2c78 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml @@ -35,7 +35,7 @@ ComboBoxStyle { background: Item { implicitWidth: 120 - implicitHeight: 25 + implicitHeight: 24 Rectangle { anchors.fill: parent diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml index e6f73eebb2..bdfb067640 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml @@ -60,13 +60,13 @@ SpinBoxStyle { height: 4 source: "image://icons/down-arrow" x: 1 - y: 2.5 // Hack! Spinbox sets an non-int offset, somewhere + y: 3 } } background: Rectangle { implicitWidth: Math.max(64, styleData.contentWidth) - implicitHeight: 23 + implicitHeight: 24 color: creatorTheme.QmlDesignerBackgroundColorDarker border.color: creatorTheme.QmlDesignerBorderColor } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml index 6b8c0fea64..dafd287dd8 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml @@ -68,7 +68,7 @@ Controls.ComboBox { ExtendedFunctionButton { x: 2 - y: 4 + anchors.verticalCenter: parent.verticalCenter backendValue: comboBox.backendValue visible: comboBox.enabled } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml index 6d9e86d23a..afabd39276 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml @@ -52,7 +52,7 @@ Controls.TextField { ExtendedFunctionButton { x: 2 - y: 6 + anchors.verticalCenter: parent.verticalCenter backendValue: lineEdit.backendValue visible: lineEdit.enabled && showExtendedFunctionButton } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml index 08ac2a0157..2a07b05817 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml @@ -35,7 +35,7 @@ Controls.SpinBox { ExtendedFunctionButton { x: 2 - y: 4 + anchors.verticalCenter: parent.verticalCenter backendValue: spinBox.backendValue visible: spinBox.enabled } -- cgit v1.2.1 From dbe42bf040a360f777b1eaabc5a7763c0edf602f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 28 Jul 2016 13:17:54 +0200 Subject: QmlDesigner: Avoid double borders between items in the item library Change-Id: I09ecba996d269a63ab24668f7f8a1c0669d9a2af Reviewed-by: Thomas Hartmann --- .../itemLibraryQmlSources/ItemDelegate.qml | 84 +++++++++++----------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml index cd046a65e3..f7836ffdf5 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml @@ -27,56 +27,58 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.0 -Rectangle { - color: creatorTheme.QmlDesignerButtonColor - - border.color: creatorTheme.QmlDesignerBorderColor - border.width: 1 +Item { + Rectangle { + anchors.rightMargin: 1 + anchors.topMargin: 1 + anchors.fill: parent + color: creatorTheme.QmlDesignerButtonColor - Image { - id: itemIcon // to be set by model + Image { + id: itemIcon // to be set by model - anchors.top: parent.top - anchors.topMargin: styleConstants.cellVerticalMargin - anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + anchors.topMargin: styleConstants.cellVerticalMargin + anchors.horizontalCenter: parent.horizontalCenter - width: itemLibraryIconWidth // to be set in Qml context - height: itemLibraryIconHeight // to be set in Qml context - source: itemLibraryIconPath // to be set by model - } + width: itemLibraryIconWidth // to be set in Qml context + height: itemLibraryIconHeight // to be set in Qml context + source: itemLibraryIconPath // to be set by model + } - Text { - id: text - font.pixelSize: 9 - elide: Text.ElideMiddle - wrapMode: Text.WordWrap - anchors.top: itemIcon.bottom - anchors.topMargin: styleConstants.cellVerticalSpacing - anchors.left: parent.left - anchors.leftMargin: styleConstants.cellHorizontalMargin - anchors.right: parent.right - anchors.rightMargin: styleConstants.cellHorizontalMargin - anchors.bottom: parent.bottom - anchors.bottomMargin: styleConstants.cellHorizontalMargin + Text { + id: text + font.pixelSize: 9 + elide: Text.ElideMiddle + wrapMode: Text.WordWrap + anchors.top: itemIcon.bottom + anchors.topMargin: styleConstants.cellVerticalSpacing + anchors.left: parent.left + anchors.leftMargin: styleConstants.cellHorizontalMargin + anchors.right: parent.right + anchors.rightMargin: styleConstants.cellHorizontalMargin + anchors.bottom: parent.bottom + anchors.bottomMargin: styleConstants.cellHorizontalMargin - verticalAlignment: Qt.AlignVCenter - horizontalAlignment: Qt.AlignHCenter - text: itemName // to be set by model - color: creatorTheme.PanelTextColorLight - renderType: Text.NativeRendering - } + verticalAlignment: Qt.AlignVCenter + horizontalAlignment: Qt.AlignHCenter + text: itemName // to be set by model + color: creatorTheme.PanelTextColorLight + renderType: Text.NativeRendering + } - MouseArea { - id: mouseRegion - anchors.fill: parent + MouseArea { + id: mouseRegion + anchors.fill: parent - property bool reallyPressed: false - property int pressedX - property int pressedY + property bool reallyPressed: false + property int pressedX + property int pressedY - onPressed: { - rootView.startDragAndDrop(itemLibraryEntry) + onPressed: { + rootView.startDragAndDrop(itemLibraryEntry) + } } } } -- cgit v1.2.1 From 735bf2cf09d658ea5e4074cb13c38212ebedb0fe Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 28 Jul 2016 15:04:43 +0200 Subject: Doc: Fix capitalization of "Editor settings" label in docs Change-Id: I3ee24f7eb52c71057ee88004d98acd977dbd2841 Reviewed-by: Leena Miettinen --- doc/src/projects/creator-projects-settings-editor.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/projects/creator-projects-settings-editor.qdoc b/doc/src/projects/creator-projects-settings-editor.qdoc index 3914bc0b12..f1f49b90fb 100644 --- a/doc/src/projects/creator-projects-settings-editor.qdoc +++ b/doc/src/projects/creator-projects-settings-editor.qdoc @@ -52,7 +52,7 @@ \li Select \uicontrol Projects > \uicontrol Editor. - \li In the \uicontrol {Editor Settings} field, select \uicontrol {Custom}. + \li In the \uicontrol {Editor settings} field, select \uicontrol {Custom}. \li Specify text editor settings for the project. -- cgit v1.2.1 From 589aef89e0c98849dda2356f5982644a779abe8f Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 28 Jul 2016 14:29:51 +0200 Subject: QmlDesigner: Remove lines/borders from scrollbars Change-Id: Iefc1d6a42df2aa858b68d4ce25840c766a8c86cb Reviewed-by: Alessandro Portale --- share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml | 5 ----- src/plugins/qmldesigner/components/resources/scrollbar.css | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml b/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml index c7741be76f..0b21e2bbfb 100644 --- a/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml +++ b/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml @@ -29,7 +29,6 @@ import QtQuick.Controls.Styles 1.1 ScrollViewStyle { readonly property color scrollbarColor: creatorTheme.BackgroundColorDark - readonly property color scrollbarBorderColor: creatorTheme.QmlDesignerBorderColor readonly property color scrollBarHandleColor: creatorTheme.QmlDesignerButtonColor padding {left: 0; top: 0; right: 0; bottom: 0} @@ -38,15 +37,11 @@ ScrollViewStyle { height: 10 width: 10 color: scrollbarColor - border.width: 1 - border.color: scrollbarBorderColor } handle: Item { implicitWidth: 10 implicitHeight: 10 Rectangle { - border.color: scrollbarBorderColor - border.width: 1 anchors.fill: parent color: scrollBarHandleColor } diff --git a/src/plugins/qmldesigner/components/resources/scrollbar.css b/src/plugins/qmldesigner/components/resources/scrollbar.css index 35606d21f6..164417a4c9 100644 --- a/src/plugins/qmldesigner/components/resources/scrollbar.css +++ b/src/plugins/qmldesigner/components/resources/scrollbar.css @@ -1,6 +1,6 @@ QScrollBar:vertical { background-color: creatorTheme.BackgroundColorDark; - border: 1px solid creatorTheme.QmlDesignerBorderColor; + border: none; margin-top: 3; margin-bottom: 3; width: 10; @@ -12,7 +12,7 @@ margin-bottom: -5; min-height: 18px; width: 8px; - border: 1px solid creatorTheme.QmlDesignerBorderColor; + border: none; border-width: 1; margin-left: -1; margin-right: -1; @@ -45,7 +45,7 @@ QScrollBar:horizontal { background-color: creatorTheme.BackgroundColorDark; - border: 1px solid creatorTheme.QmlDesignerBorderColor; + border: none; margin-left: 3; margin-right: 3; height: 10; @@ -58,7 +58,7 @@ margin-right: -5; min-width: 18px; height: 8px; - border: 1px solid creatorTheme.QmlDesignerBorderColor; + border: none; border-width: 1; margin-top: -1; margin-bottom: -1; -- cgit v1.2.1 From f398e7d22ac710dd8ed7bc110b56424e4e3c6b2f Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 24 Jul 2016 09:42:35 +0300 Subject: TextEditor: Use initial palette for default colors The theme might be incompatible with the text style settings, especially those that rely on the default palette (and were designed before themes were implemented). Task-number: QTCREATORBUG-16482 Change-Id: I8f63460ad250a494dcafd11366d7bacdbb71c142 Reviewed-by: Thomas Hartmann Reviewed-by: Alessandro Portale --- src/plugins/texteditor/colorschemeedit.cpp | 3 +++ src/plugins/texteditor/fontsettingspage.cpp | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/plugins/texteditor/colorschemeedit.cpp b/src/plugins/texteditor/colorschemeedit.cpp index 198f03b11f..18b719ba2f 100644 --- a/src/plugins/texteditor/colorschemeedit.cpp +++ b/src/plugins/texteditor/colorschemeedit.cpp @@ -26,6 +26,8 @@ #include "colorschemeedit.h" #include "ui_colorschemeedit.h" +#include + #include #include @@ -148,6 +150,7 @@ ColorSchemeEdit::ColorSchemeEdit(QWidget *parent) : m_formatsModel(new FormatsModel(this)), m_readOnly(false) { + setPalette(Utils::Theme::initialPalette()); m_ui->setupUi(this); m_ui->itemList->setModel(m_formatsModel); diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index 97865a404a..7357510abd 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -253,15 +253,17 @@ FormatDescription::FormatDescription(TextStyle id, QColor FormatDescription::defaultForeground(TextStyle id) { if (id == C_LINE_NUMBER) { - const QColor bg = QApplication::palette().background().color(); + const QPalette palette = Utils::Theme::initialPalette(); + const QColor bg = palette.background().color(); if (bg.value() < 128) - return QApplication::palette().foreground().color(); + return palette.foreground().color(); else - return QApplication::palette().dark().color(); + return palette.dark().color(); } else if (id == C_CURRENT_LINE_NUMBER) { - const QColor bg = QApplication::palette().background().color(); + const QPalette palette = Utils::Theme::initialPalette(); + const QColor bg = palette.background().color(); if (bg.value() < 128) - return QApplication::palette().foreground().color(); + return palette.foreground().color(); else return QColor(); } else if (id == C_PARENTHESES) { @@ -277,7 +279,7 @@ QColor FormatDescription::defaultBackground(TextStyle id) if (id == C_TEXT) { return Qt::white; } else if (id == C_LINE_NUMBER) { - return QApplication::palette().background().color(); + return Utils::Theme::initialPalette().background().color(); } else if (id == C_SEARCH_RESULT) { return QColor(0xffef0b); } else if (id == C_PARENTHESES) { @@ -287,7 +289,7 @@ QColor FormatDescription::defaultBackground(TextStyle id) } else if (id == C_AUTOCOMPLETE) { return QColor(192, 192, 255); } else if (id == C_CURRENT_LINE || id == C_SEARCH_SCOPE) { - const QPalette palette = QApplication::palette(); + const QPalette palette = Utils::Theme::initialPalette(); const QColor &fg = palette.color(QPalette::Highlight); const QColor &bg = palette.color(QPalette::Base); @@ -308,8 +310,7 @@ QColor FormatDescription::defaultBackground(TextStyle id) fg.blueF() * ratio + bg.blueF() * (1 - ratio)); return col; } else if (id == C_SELECTION) { - const QPalette palette = QApplication::palette(); - return palette.color(QPalette::Highlight); + return Utils::Theme::initialPalette().color(QPalette::Highlight); } else if (id == C_OCCURRENCES) { return QColor(180, 180, 180); } else if (id == C_OCCURRENCES_RENAME) { -- cgit v1.2.1 From 5303a9b48578b75adc7f28a5cf2e21202e975121 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 27 Jul 2016 16:10:19 +0200 Subject: QmlDesigner.PropertyEditor: Show border between buttons without this it is not 100% clear that we have separated buttons. Change-Id: I2d8ee228a0104d68e381d23c5435a1b9cb7cf4cb Reviewed-by: Alessandro Portale --- .../propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml | 2 -- .../propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml index ccaf16a06f..8b956fb6c4 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml @@ -65,7 +65,6 @@ Item { anchors.fill: parent RoundedPanel { roundLeft: isFirst() && buttonRowButton.roundLeftButton - roundRight: isLast() anchors.fill: parent visible: checked @@ -74,7 +73,6 @@ Item { RoundedPanel { roundLeft: isFirst() - roundRight: isLast() anchors.fill: parent visible: !checked diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml index a0f3fe1796..2389de12f1 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml @@ -30,8 +30,8 @@ import QtQuick.Layouts 1.0 Rectangle { id: panel - property bool roundLeft: false - property bool roundRight: false + property bool roundLeft: true + property bool roundRight: true /* -- cgit v1.2.1 From 80352d703c6fdcbac6c3d92e00da9ae75aeea352 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 28 Jul 2016 15:24:20 +0200 Subject: Tests: Disable QTest crashhandler for plugin unit tests Temporary workaround to avoid dead lock when executing plugin unit test. Change-Id: Ie6c3673d756ff3b67320bcc75d590933e58a5276 Reviewed-by: Ulf Hermann --- src/libs/extensionsystem/pluginmanager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index e26863265e..63d9840853 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -1024,6 +1024,8 @@ static int executeTestPlan(const TestPlan &testPlan) << QLatin1String("arg0") // fake application name << QLatin1String("-maxwarnings") << QLatin1String("0"); // unlimit output qExecArguments << functions; + // avoid being stuck in QTBUG-24925 + qExecArguments << "-nocrashhandler"; failedTests += QTest::qExec(testObject, qExecArguments); } -- cgit v1.2.1 From 14428c1586854846a2320c86e8621d65d9f4fc0a Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 27 Jul 2016 08:48:46 +0200 Subject: Clang: Decrease order of snippets The order is 0 by default and thus the snippet items were at the very top, e.g.: enum EnumType { EnumValue }; void f() { EnumType et = // Complete here and see snippet items at top } Change-Id: I70a160d102b91a2589972354c50aa5f0b29323e8 Reviewed-by: Tim Jenssen --- src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp | 3 ++- src/plugins/cpptools/cppcompletionassistprocessor.cpp | 5 +++-- src/plugins/cpptools/cppcompletionassistprocessor.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index 0fde4dd276..f979a33af8 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -136,7 +136,8 @@ using namespace CPlusPlus; using namespace TextEditor; ClangCompletionAssistProcessor::ClangCompletionAssistProcessor() - : m_completionOperator(T_EOF_SYMBOL) + : CppCompletionAssistProcessor(100) + , m_completionOperator(T_EOF_SYMBOL) { } diff --git a/src/plugins/cpptools/cppcompletionassistprocessor.cpp b/src/plugins/cpptools/cppcompletionassistprocessor.cpp index 5dd5228538..d1a1be9bac 100644 --- a/src/plugins/cpptools/cppcompletionassistprocessor.cpp +++ b/src/plugins/cpptools/cppcompletionassistprocessor.cpp @@ -40,7 +40,7 @@ using namespace CPlusPlus; namespace CppTools { -CppCompletionAssistProcessor::CppCompletionAssistProcessor() +CppCompletionAssistProcessor::CppCompletionAssistProcessor(int snippetItemOrder) : m_positionForProposal(-1) , m_preprocessorCompletions(QStringList() << QLatin1String("define") @@ -72,7 +72,8 @@ CppCompletionAssistProcessor::CppCompletionAssistProcessor() << QLatin1String("endif")) , m_hintProposal(0) , m_snippetCollector(QLatin1String(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID), - QIcon(QLatin1String(":/texteditor/images/snippet.png"))) + QIcon(QLatin1String(":/texteditor/images/snippet.png")), + snippetItemOrder) { } diff --git a/src/plugins/cpptools/cppcompletionassistprocessor.h b/src/plugins/cpptools/cppcompletionassistprocessor.h index 7ccc632e63..535ce62a5e 100644 --- a/src/plugins/cpptools/cppcompletionassistprocessor.h +++ b/src/plugins/cpptools/cppcompletionassistprocessor.h @@ -45,7 +45,7 @@ namespace CppTools { class CPPTOOLS_EXPORT CppCompletionAssistProcessor : public TextEditor::IAssistProcessor { public: - CppCompletionAssistProcessor(); + CppCompletionAssistProcessor(int snippetItemOrder = 0); protected: void addSnippets(); -- cgit v1.2.1 From ccf040239fa47dd3ee8b490367b4a8209e5a73ff Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 28 Jul 2016 15:02:45 +0200 Subject: QmlDesigner.PropertyEditor: Improve binding editor The binding editor now behaves like a modal dialog in the property editor. Change-Id: I9b1a0635dbe5cc0b055225411af653dd8bf6b735 Reviewed-by: Leena Miettinen Reviewed-by: Tim Jenssen --- .../HelperWidgets/ExtendedFunctionButton.qml | 211 +++++++++++---------- 1 file changed, 114 insertions(+), 97 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml index a3d14a710e..2eaf898b6a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml @@ -125,123 +125,140 @@ Item { } } - Rectangle { - parent: itemPane - visible: false - x: 6 + Item { - id: expressionDialog + Rectangle { + anchors.fill: parent + color: creatorTheme.QmlDesignerBackgroundColorDarker + opacity: 0.6 + } - onVisibleChanged: { - var pos = itemPane.mapFromItem(extendedFunctionButton.parent, 0, 0); - y = pos.y + 2; + MouseArea { + anchors.fill: parent } - width: parent.width - 12 - height: 120 - - radius: 2 - color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate - //border.color: creatorTheme.QmlDesignerBackgroundColorDarker - border.color: creatorTheme.QmlDesignerTabLight - - Controls.TextField { - id: textField - anchors.fill: parent - anchors.leftMargin: 4 - anchors.rightMargin: 4 - anchors.topMargin: 4 - anchors.bottomMargin: 20 - onAccepted: { - backendValue.expression = textField.text - expressionDialog.visible = false + + id: expressionDialog + visible: false + parent: itemPane + + anchors.fill: parent + + + + Rectangle { + x: 4 + onVisibleChanged: { + var pos = itemPane.mapFromItem(extendedFunctionButton.parent, 0, 0); + y = pos.y + 2; } - style: TextFieldStyle { - textColor: creatorTheme.PanelTextColorLight - padding.top: 3 - padding.bottom: 1 - padding.left: 16 - placeholderTextColor: creatorTheme.PanelTextColorMid - background: Rectangle { - implicitWidth: 100 - implicitHeight: 23 - radius: 2 - color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate + width: parent.width - 8 + height: 160 + + radius: 2 + color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate + border.color: creatorTheme.QmlDesignerBorderColor + + Label { + x: 8 + y: 6 + font.bold: true + text: qsTr("Binding Editor") + } + + Controls.TextField { + verticalAlignment: Text.AlignTop + id: textField + anchors.fill: parent + anchors.leftMargin: 8 + anchors.rightMargin: 8 + anchors.topMargin: 24 + anchors.bottomMargin: 32 + onAccepted: { + backendValue.expression = textField.text + expressionDialog.visible = false + } + + style: TextFieldStyle { + textColor: creatorTheme.PanelTextColorLight + padding.top: 6 + padding.bottom: 2 + padding.left: 6 + placeholderTextColor: creatorTheme.PanelTextColorMid + background: Rectangle { + implicitWidth: 100 + implicitHeight: 23 + radius: 2 + color: creatorTheme.QmlDesignerBackgroundColorDarker + border.color: creatorTheme.QmlDesignerBorderColor + } } } - } - Row { - spacing: 0 - Button { - width: 16 - height: 16 - style: ButtonStyle { - background: Item{ - Image { - width: 16 - height: 16 - source: "image://icons/error" - opacity: { - if (control.pressed) - return 0.5; - - if (control.hovered) + Row { + spacing: 2 + Button { + width: 16 + height: 16 + style: ButtonStyle { + background: Item{ + Image { + width: 16 + height: 16 + source: "image://icons/error" + opacity: { + if (control.pressed) + return 0.8; return 1.0; - - return 0.9; - } - Rectangle { - z: -1 - anchors.fill: parent - color: control.hovered? creatorTheme.FancyToolButtonSelectedColor : creatorTheme.BackgroundColorDark - border.color: creatorTheme.QmlDesignerBackgroundColorDarker - radius: 2 + } + Rectangle { + z: -1 + anchors.fill: parent + color: control.pressed || control.hovered ? creatorTheme.QmlDesignerBackgroundColorDarker : creatorTheme.QmlDesignerButtonColor + border.color: creatorTheme.QmlDesignerBorderColor + radius: 2 + } } } } + onClicked: { + backendValue.expression = textField.text + expressionDialog.visible = false + } } - onClicked: { - backendValue.expression = textField.text - expressionDialog.visible = false - } - } - Button { - width: 16 - height: 16 - style: ButtonStyle { - background: Item { - Image { - width: 16 - height: 16 - source: "image://icons/ok" - opacity: { - if (control.pressed) - return 0.5; - - if (control.hovered) + Button { + width: 16 + height: 16 + style: ButtonStyle { + background: Item { + Image { + width: 16 + height: 16 + source: "image://icons/ok" + opacity: { + if (control.pressed) + return 0.8; return 1.0; - - return 0.9; - } - Rectangle { - z: -1 - anchors.fill: parent - color: control.hovered? creatorTheme.FancyToolButtonSelectedColor : creatorTheme.BackgroundColorDark - border.color: creatorTheme.QmlDesignerBackgroundColorDarker - radius: 2 + } + Rectangle { + z: -1 + anchors.fill: parent + color: control.pressed || control.hovered ? creatorTheme.QmlDesignerBackgroundColorDarker : creatorTheme.QmlDesignerButtonColor + border.color: creatorTheme.QmlDesignerBorderColor + radius: 2 + } } } } + onClicked: { + expressionDialog.visible = false + } } - onClicked: { - expressionDialog.visible = false - } + anchors.right: parent.right + anchors.bottom: parent.bottom + anchors.margins: 4 } - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.margins: 2 } } -- cgit v1.2.1 From b1477190de01afb12cc11a326f0fd36c8f026e06 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 28 Jul 2016 11:29:06 +0200 Subject: Fix qbs build on macOS "osx" -> "macos" Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08 Reviewed-by: Jake Petroules --- qbs/imports/QtcAutotest.qbs | 2 +- qbs/imports/QtcDocumentation.qbs | 2 +- qbs/imports/QtcFunctions/functions.js | 2 +- qbs/imports/QtcLibrary.qbs | 6 +++--- qbs/imports/QtcPlugin.qbs | 6 +++--- qbs/imports/QtcTool.qbs | 2 +- qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 2 +- qbs/modules/qtc/qtc.qbs | 16 ++++++++-------- share/share.qbs | 2 +- src/app/app.qbs | 10 +++++----- src/libs/ssh/ssh.qbs | 4 ++-- src/libs/utils/utils.qbs | 6 +++--- src/plugins/clearcase/clearcase.qbs | 2 +- src/plugins/coreplugin/coreplugin.qbs | 8 ++++---- src/plugins/ios/ios.qbs | 2 +- src/plugins/projectexplorer/projectexplorer.qbs | 2 +- .../qmldesigner/componentsplugin/componentsplugin.qbs | 2 +- src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs | 2 +- src/tools/3rdparty/iossim/iossim.qbs | 2 +- src/tools/3rdparty/iossim_1_8_2/iossim.qbs | 2 +- src/tools/clangbackend/clangbackend.qbs | 2 +- src/tools/iostool/iostool.qbs | 2 +- src/tools/qml2puppet/qml2puppet.qbs | 2 +- src/tools/sdktool/sdktool.qbs | 2 +- 24 files changed, 45 insertions(+), 45 deletions(-) diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index 35d67e7af2..586626b22d 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -26,7 +26,7 @@ QtcProduct { // The following would be conceptually right, but does not work currently as some autotests // (e.g. extensionsystem) do not work when installed, because they want hardcoded // absolute paths to resources in the build directory. - // cpp.rpaths: qbs.targetOS.contains("osx") + // cpp.rpaths: qbs.targetOS.contains("macos") // ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"] // : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator", // "$ORIGIN/../" qtc.libDirName + "/qtcreator/plugins"] diff --git a/qbs/imports/QtcDocumentation.qbs b/qbs/imports/QtcDocumentation.qbs index 350033be17..c98ee8dec3 100644 --- a/qbs/imports/QtcDocumentation.qbs +++ b/qbs/imports/QtcDocumentation.qbs @@ -28,7 +28,7 @@ Product { Group { fileTagsFilter: ["qch"] - qbs.install: !qbs.targetOS.contains("osx") + qbs.install: !qbs.targetOS.contains("macos") qbs.installDir: qtc.ide_doc_path } } diff --git a/qbs/imports/QtcFunctions/functions.js b/qbs/imports/QtcFunctions/functions.js index 23a51f80e8..c9dd1cf3a0 100644 --- a/qbs/imports/QtcFunctions/functions.js +++ b/qbs/imports/QtcFunctions/functions.js @@ -4,7 +4,7 @@ function qtLibraryName(qbs, name) if (qbs.debugInformation) { if (qbs.targetOS.contains("windows")) return name + "d"; - else if (qbs.targetOS.contains("osx")) + else if (qbs.targetOS.contains("macos")) return name + "_debug"; } return name; diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index e4dd782b11..5c54ba8894 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -18,14 +18,14 @@ QtcProduct { var flags = base; if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc")) flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb - if (qbs.targetOS.contains("osx")) + if (qbs.targetOS.contains("macos")) flags.push("-compatibility_version", qtc.qtcreator_compat_version); return flags; } - cpp.sonamePrefix: qbs.targetOS.contains("osx") + cpp.sonamePrefix: qbs.targetOS.contains("macos") ? "@rpath" : undefined - cpp.rpaths: qbs.targetOS.contains("osx") + cpp.rpaths: qbs.targetOS.contains("macos") ? ["@loader_path/../Frameworks"] : ["$ORIGIN", "$ORIGIN/.."] property string libIncludeBase: ".." // #include diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index e18607ffba..8d68c234fe 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -27,17 +27,17 @@ QtcProduct { cpp.internalVersion: "" cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"]) - cpp.sonamePrefix: qbs.targetOS.contains("osx") + cpp.sonamePrefix: qbs.targetOS.contains("macos") ? "@rpath" : undefined - cpp.rpaths: qbs.targetOS.contains("osx") + cpp.rpaths: qbs.targetOS.contains("macos") ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"] : ["$ORIGIN", "$ORIGIN/.."] cpp.linkerFlags: { var flags = base; if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc")) flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb - if (qbs.targetOS.contains("osx")) + if (qbs.targetOS.contains("macos")) flags.push("-compatibility_version", qtc.qtcreator_compat_version); return flags; } diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs index e8dd54efaa..304e2e87a9 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -12,7 +12,7 @@ QtcProduct { '/' + qtc.ide_library_path); var relativePathToPlugins = FileInfo.relativePath('/' + qtc.ide_libexec_path, '/' + qtc.ide_plugin_path); - var prefix = qbs.targetOS.contains("osx") ? "@executable_path" : "$ORIGIN"; + var prefix = qbs.targetOS.contains("macos") ? "@executable_path" : "$ORIGIN"; return [ FileInfo.joinPaths(prefix, relativePathToLibs), FileInfo.joinPaths(prefix, relativePathToPlugins) diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index 88128a97d1..00d2d34bdd 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -8,7 +8,7 @@ Module { property bool enableProjectFileUpdates: true property bool installApiHeaders: false property string libInstallDir: qtc.ide_library_path - property stringList libRPaths: qbs.targetOS.contains("osx") + property stringList libRPaths: qbs.targetOS.contains("macos") ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)] : ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path] property string resourcesInstallDir: qtc.ide_data_path + "/qbs" diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 955850dfa9..65ea37e714 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -16,10 +16,10 @@ Module { + ide_compat_version_minor + '.' + ide_compat_version_release property string libDirName: "lib" - property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin" - property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator" + property string ide_app_path: qbs.targetOS.contains("macos") ? "" : "bin" + property string ide_app_target: qbs.targetOS.contains("macos") ? "Qt Creator" : "qtcreator" property string ide_library_path: { - if (qbs.targetOS.contains("osx")) + if (qbs.targetOS.contains("macos")) return ide_app_target + ".app/Contents/Frameworks" else if (qbs.targetOS.contains("windows")) return ide_app_path @@ -27,24 +27,24 @@ Module { return libDirName + "/qtcreator" } property string ide_plugin_path: { - if (qbs.targetOS.contains("osx")) + if (qbs.targetOS.contains("macos")) return ide_app_target + ".app/Contents/PlugIns" else if (qbs.targetOS.contains("windows")) return libDirName + "/qtcreator/plugins" else return ide_library_path + "/plugins" } - property string ide_data_path: qbs.targetOS.contains("osx") + property string ide_data_path: qbs.targetOS.contains("macos") ? ide_app_target + ".app/Contents/Resources" : "share/qtcreator" - property string ide_libexec_path: qbs.targetOS.contains("osx") + property string ide_libexec_path: qbs.targetOS.contains("macos") ? ide_data_path : qbs.targetOS.contains("windows") ? ide_app_path : "libexec/qtcreator" - property string ide_bin_path: qbs.targetOS.contains("osx") + property string ide_bin_path: qbs.targetOS.contains("macos") ? ide_app_target + ".app/Contents/MacOS" : ide_app_path - property string ide_doc_path: qbs.targetOS.contains("osx") + property string ide_doc_path: qbs.targetOS.contains("macos") ? ide_data_path + "/doc" : "share/doc/qtcreator" property string ide_include_path: "include" diff --git a/share/share.qbs b/share/share.qbs index df3e418bf4..08688ec092 100644 --- a/share/share.qbs +++ b/share/share.qbs @@ -55,7 +55,7 @@ Product { ] if (qbs.targetOS.contains("windows")) list.push("notepad_win.xml"); - else if (qbs.targetOS.contains("osx")) + else if (qbs.targetOS.contains("macos")) list.push("vi_mac.xml"); else list.push("vi.xml"); diff --git a/src/app/app.qbs b/src/app/app.qbs index db720637db..2eac52ac64 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -2,10 +2,10 @@ import qbs QtcProduct { Depends { name: "bundle" } - Depends { name: "ib"; condition: qbs.targetOS.contains("osx") } + Depends { name: "ib"; condition: qbs.targetOS.contains("macos") } Properties { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") ib.appIconName: "qtcreator" } @@ -23,7 +23,7 @@ QtcProduct { installDir: qtc.ide_bin_path property bool qtcRunnable: true - cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/../Frameworks"] + cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"] : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator"] cpp.includePaths: [ project.sharedSourcesDir + "/qtsingleapplication", @@ -51,7 +51,7 @@ QtcProduct { Group { name: "qtcreator.sh" - condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos") files: "../../bin/qtcreator.sh" qbs.install: true qbs.installDir: "bin" @@ -74,7 +74,7 @@ QtcProduct { } Group { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") fileTagsFilter: ["aggregate_infoplist", "pkginfo", "compiled_assetcatalog"] qbs.install: true qbs.installSourceBase: product.buildDirectory diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs index e3ef0cf3f5..c79dacb79f 100644 --- a/src/libs/ssh/ssh.qbs +++ b/src/libs/ssh/ssh.qbs @@ -69,7 +69,7 @@ Project { result.push("advapi32", "user32") else if (qbs.targetOS.contains("linux")) result.push("rt", "dl"); - else if (qbs.targetOS.contains("osx")) + else if (qbs.targetOS.contains("macos")) result.push("dl"); else if (qbs.targetOS.contains("unix")) result.push("rt"); @@ -95,7 +95,7 @@ Project { "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM", "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW", "BOTAN_HAS_ENTROPY_SRC_UNIX", "BOTAN_HAS_MUTEX_PTHREAD", "BOTAN_HAS_PIPE_UNIXFD_IO") - if (qbs.targetOS.contains("osx")) + if (qbs.targetOS.contains("macos")) result.push("BOTAN_TARGET_OS_IS_DARWIN", "BOTAN_TARGET_OS_HAS_GETTIMEOFDAY", "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM", "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW", diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index dc5e7b71e9..8b41c2f602 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -18,7 +18,7 @@ Project { if (qbs.targetOS.contains("windows")) { libs.push("user32", "iphlpapi", "ws2_32", "shell32"); } else if (qbs.targetOS.contains("unix")) { - if (!qbs.targetOS.contains("osx")) + if (!qbs.targetOS.contains("macos")) libs.push("X11"); if (!qbs.targetOS.contains("openbsd")) libs.push("pthread"); @@ -29,7 +29,7 @@ Project { cpp.enableExceptions: true Properties { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") cpp.frameworks: ["Foundation"] } @@ -278,7 +278,7 @@ Project { Group { name: "FileUtils_osx" - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") files: [ "fileutils_mac.h", "fileutils_mac.mm", ] diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs index 2c52f4690a..9fd072a28e 100644 --- a/src/plugins/clearcase/clearcase.qbs +++ b/src/plugins/clearcase/clearcase.qbs @@ -3,7 +3,7 @@ import qbs 1.0 QtcPlugin { name: "ClearCase" - pluginJsonReplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")}) + pluginJsonReplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("macos") ? "true": "false")}) Depends { name: "Qt.widgets" } Depends { name: "Utils" } diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index d2e2c7d268..ed50f54985 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -27,7 +27,7 @@ Project { return ["ole32", "user32"] } - cpp.frameworks: qbs.targetOS.contains("osx") ? ["AppKit"] : undefined + cpp.frameworks: qbs.targetOS.contains("macos") ? ["AppKit"] : undefined Group { name: "General" @@ -176,7 +176,7 @@ Project { Group { name: "ProgressManager_mac" - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") files: [ "progressmanager/progressmanager_mac.mm", ] @@ -184,7 +184,7 @@ Project { Group { name: "ProgressManager_x11" - condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos") files: [ "progressmanager/progressmanager_x11.cpp", ] @@ -288,7 +288,7 @@ Project { Group { name: "Locator_mac" - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") files: [ "locator/spotlightlocatorfilter.h", "locator/spotlightlocatorfilter.mm", diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs index 0eb70f2f10..e38618c7a4 100644 --- a/src/plugins/ios/ios.qbs +++ b/src/plugins/ios/ios.qbs @@ -11,7 +11,7 @@ QtcPlugin { Depends { name: "QmlDebug" } Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } - cpp.frameworks: base.concat(qbs.targetOS.contains("osx") ? ["CoreFoundation", "IOKit"] : []) + cpp.frameworks: base.concat(qbs.targetOS.contains("macos") ? ["CoreFoundation", "IOKit"] : []) files: [ "ios.qrc", diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index af6b8fbc8a..e7103ce1da 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -17,7 +17,7 @@ Project { cpp.defines: base.concat("QTC_CPU=X86Architecture") Properties { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") cpp.frameworks: base.concat(["Carbon"]) } diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs index 55f6c6a1df..e8a5cae40b 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs @@ -4,7 +4,7 @@ QtcProduct { name: "componentsplugin" type: ["dynamiclibrary"] installDir: qtc.ide_plugin_path + '/' + installDirName - property string installDirName: qbs.targetOS.contains("osx") ? "QmlDesigner" : "qmldesigner" + property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner" Depends { name: "Core" } Depends { name: "QmlDesigner" } diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs index 60f0711674..56f5a83d87 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs @@ -4,7 +4,7 @@ QtcProduct { name: "qtquickplugin" type: ["dynamiclibrary"] installDir: qtc.ide_plugin_path + '/' + installDirName - property string installDirName: qbs.targetOS.contains("osx") ? "QmlDesigner" : "qmldesigner" + property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner" cpp.defines: base.concat("QTQUICK_LIBRARY") cpp.includePaths: base.concat("../designercore/include") diff --git a/src/tools/3rdparty/iossim/iossim.qbs b/src/tools/3rdparty/iossim/iossim.qbs index 3c55f5f649..5a7f642563 100644 --- a/src/tools/3rdparty/iossim/iossim.qbs +++ b/src/tools/3rdparty/iossim/iossim.qbs @@ -2,7 +2,7 @@ import qbs 1.0 QtcTool { name: "iossim" - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") Depends { name: "bundle" } Depends { name: "Qt"; submodules: ["widgets"] } diff --git a/src/tools/3rdparty/iossim_1_8_2/iossim.qbs b/src/tools/3rdparty/iossim_1_8_2/iossim.qbs index ce138f7a20..f2537dad06 100644 --- a/src/tools/3rdparty/iossim_1_8_2/iossim.qbs +++ b/src/tools/3rdparty/iossim_1_8_2/iossim.qbs @@ -4,7 +4,7 @@ import QtcTool QtcTool { name: "iossim" - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") Depends { name: "Qt"; submodules: ["widgets"] } Depends { name: "app_version_header" } diff --git a/src/tools/clangbackend/clangbackend.qbs b/src/tools/clangbackend/clangbackend.qbs index 83684c17f9..7f154f963d 100644 --- a/src/tools/clangbackend/clangbackend.qbs +++ b/src/tools/clangbackend/clangbackend.qbs @@ -24,7 +24,7 @@ QtcTool { cpp.rpaths: base.concat(libclang.llvmLibDir) Properties { - condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos") cpp.linkerFlags: base.concat(["-z", "origin"]) } } diff --git a/src/tools/iostool/iostool.qbs b/src/tools/iostool/iostool.qbs index 53fc2b74e3..b06d996e00 100644 --- a/src/tools/iostool/iostool.qbs +++ b/src/tools/iostool/iostool.qbs @@ -2,7 +2,7 @@ import qbs 1.0 QtcTool { name: "iostool" - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") Depends { name: "bundle" } Depends { name: "Qt.widgets" } diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 0395e8b777..e5fe8f44d7 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -3,7 +3,7 @@ import QtcFunctions QtcTool { name: "qml2puppet" - installDir: qbs.targetOS.contains("osx") + installDir: qbs.targetOS.contains("macos") ? qtc.ide_libexec_path + "/qmldesigner" : qtc.ide_libexec_path Depends { name: "bundle" } diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs index be97b82750..a031232aba 100644 --- a/src/tools/sdktool/sdktool.qbs +++ b/src/tools/sdktool/sdktool.qbs @@ -7,7 +7,7 @@ QtcTool { Depends { name: "Utils" } Depends { name: "app_version_header" } - cpp.defines: base.concat([qbs.targetOS.contains("osx") + cpp.defines: base.concat([qbs.targetOS.contains("macos") ? 'DATA_PATH="."' : qbs.targetOS.contains("windows") ? 'DATA_PATH="../share/qtcreator"' : 'DATA_PATH="../../share/qtcreator"']) -- cgit v1.2.1 From 9f53b0e13c6ebc4da4e688da364a39a313cdb723 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 28 Jul 2016 17:18:31 +0200 Subject: ProjectExplorer: Themable miniprojecttargetselector.cpp Replace some hard-coded colors with theme colors. That is required for the Flat Light theme. Change-Id: I2ce289fce8c2e6437148eb691484e0441975979f Reviewed-by: Tim Jenssen --- share/qtcreator/themes/flat-dark.creatortheme | 2 +- share/qtcreator/themes/flat-light.creatortheme | 2 +- share/qtcreator/themes/flat.creatortheme | 2 +- src/plugins/projectexplorer/miniprojecttargetselector.cpp | 7 +++++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index d2e194dd3f..5469e2d1d3 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -105,7 +105,7 @@ MenuItemTextColorNormal=text MiniProjectTargetSelectorBackgroundColor=shadowBackground MiniProjectTargetSelectorBorderColor=shadowBackground MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground -MiniProjectTargetSelectorTextColor=text +MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor PanelStatusBarBackgroundColor=shadowBackground PanelsWidgetSeparatorLineColor=0 PanelTextColorDark=text diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index f801f9eaa5..ef550cc010 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -102,7 +102,7 @@ MenuItemTextColorNormal=text MiniProjectTargetSelectorBackgroundColor=shadowBackground MiniProjectTargetSelectorBorderColor=shadowBackground MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground -MiniProjectTargetSelectorTextColor=text +MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor PanelStatusBarBackgroundColor=shadowBackground PanelsWidgetSeparatorLineColor=0 PanelTextColorDark=text diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index 285bc9c99c..51fd6df5aa 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -101,7 +101,7 @@ MenuItemTextColorNormal=text MiniProjectTargetSelectorBackgroundColor=shadowBackground MiniProjectTargetSelectorBorderColor=shadowBackground MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground -MiniProjectTargetSelectorTextColor=text +MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor PanelStatusBarBackgroundColor=shadowBackground PanelsWidgetSeparatorLineColor=0 PanelTextColorDark=text diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 975a177172..0622f60b9c 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -152,7 +152,7 @@ void TargetSelectorDelegate::paint(QPainter *painter, QFontMetrics fm(option.font); QString text = index.data(Qt::DisplayRole).toString(); - painter->setPen(QColor(255, 255, 255, 160)); + painter->setPen(creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor)); QString elidedText = fm.elidedText(text, Qt::ElideMiddle, option.rect.width() - 12); if (elidedText != text) const_cast(index.model())->setData(index, text, Qt::ToolTipRole); @@ -174,7 +174,10 @@ ListWidget::ListWidget(QWidget *parent) : QListWidget(parent) setFocusPolicy(Qt::WheelFocus); setItemDelegate(new TargetSelectorDelegate(this)); setAttribute(Qt::WA_MacShowFocusRect, false); - setStyleSheet(QString::fromLatin1("QListWidget { background: #464646; border-style: none; }")); + const QColor bgColor = creatorTheme()->color(Theme::MiniProjectTargetSelectorBackgroundColor); + const QString bgColorName = creatorTheme()->flag(Theme::FlatToolBars) + ? bgColor.lighter(120).name() : bgColor.name(); + setStyleSheet(QString::fromLatin1("QListWidget { background: %1; border-style: none; }").arg(bgColorName)); setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); } -- cgit v1.2.1 From bc6faeade2b42f2cc7ed4eaf903fc43d47e2e278 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 28 Jul 2016 17:22:42 +0200 Subject: QmlDesigner: Use proper icons for Controls 1.0 * Using proper icons * Removing unused images Change-Id: I0b4ba6d33f14950fef28f9546aa39b7f5d5a38dd Reviewed-by: Tim Jenssen --- .../componentsplugin/components.metainfo | 28 +-------------------- .../componentsplugin/componentsplugin.qrc | 12 --------- .../componentsplugin/images/busyindicator.png | Bin 1145 -> 0 bytes .../componentsplugin/images/busyindicator16.png | Bin 826 -> 0 bytes .../componentsplugin/images/busyindicatora.png | Bin 767 -> 0 bytes .../componentsplugin/images/busyindicatora16.png | Bin 670 -> 0 bytes .../qmldesigner/componentsplugin/images/button.png | Bin 716 -> 109 bytes .../componentsplugin/images/button16.png | Bin 502 -> 107 bytes .../componentsplugin/images/buttoncolumn.png | Bin 523 -> 0 bytes .../componentsplugin/images/buttoncolumn16.png | Bin 432 -> 0 bytes .../componentsplugin/images/buttonrow.png | Bin 485 -> 0 bytes .../componentsplugin/images/buttonrow16.png | Bin 429 -> 0 bytes .../componentsplugin/images/checkbox.png | Bin 790 -> 190 bytes .../componentsplugin/images/checkbox16.png | Bin 569 -> 122 bytes .../componentsplugin/images/combobox.png | Bin 934 -> 151 bytes .../componentsplugin/images/combobox16.png | Bin 659 -> 149 bytes .../componentsplugin/images/item-icon.png | Bin 396 -> 337 bytes .../componentsplugin/images/item-icon16.png | Bin 312 -> 266 bytes .../qmldesigner/componentsplugin/images/label.png | Bin 351 -> 151 bytes .../componentsplugin/images/label16.png | Bin 299 -> 152 bytes .../componentsplugin/images/progressbar.png | Bin 261 -> 103 bytes .../componentsplugin/images/progressbar16.png | Bin 293 -> 100 bytes .../componentsplugin/images/radiobutton.png | Bin 959 -> 184 bytes .../componentsplugin/images/radiobutton16.png | Bin 627 -> 176 bytes .../qmldesigner/componentsplugin/images/slider.png | Bin 776 -> 160 bytes .../componentsplugin/images/slider16.png | Bin 540 -> 154 bytes .../componentsplugin/images/sliderh.png | Bin 814 -> 0 bytes .../componentsplugin/images/sliderh16.png | Bin 554 -> 0 bytes .../qmldesigner/componentsplugin/images/tabbar.png | Bin 271 -> 0 bytes .../componentsplugin/images/tabbar16.png | Bin 152 -> 0 bytes .../componentsplugin/images/tabbutton.png | Bin 545 -> 0 bytes .../componentsplugin/images/tabbutton16.png | Bin 410 -> 0 bytes .../componentsplugin/images/textarea.png | Bin 780 -> 138 bytes .../componentsplugin/images/textarea16.png | Bin 549 -> 134 bytes .../componentsplugin/images/textfield.png | Bin 755 -> 135 bytes .../componentsplugin/images/textfield16.png | Bin 467 -> 127 bytes .../componentsplugin/images/toolbar.png | Bin 226 -> 0 bytes .../componentsplugin/images/toolbar16.png | Bin 138 -> 0 bytes 38 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/busyindicator.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/buttoncolumn.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/buttoncolumn16.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/buttonrow.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/buttonrow16.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/sliderh.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/sliderh16.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/tabbar.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/tabbar16.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/tabbutton.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/tabbutton16.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/toolbar.png delete mode 100644 src/plugins/qmldesigner/componentsplugin/images/toolbar16.png diff --git a/src/plugins/qmldesigner/componentsplugin/components.metainfo b/src/plugins/qmldesigner/componentsplugin/components.metainfo index 22f782038b..29490fa471 100644 --- a/src/plugins/qmldesigner/componentsplugin/components.metainfo +++ b/src/plugins/qmldesigner/componentsplugin/components.metainfo @@ -71,32 +71,6 @@ MetaInfo { } } - Type { - name: "QtQuick.Controls.ButtonRow" - icon: ":/componentsplugin/images/buttonrow16.png" - - ItemLibraryEntry { - name: "Button Row" - category: "Qt Quick - Controls" - libraryIcon: ":/componentsplugin/images/buttonrow.png" - version: "1.0" - requiredImport: "QtQuick.Controls" - } - } - - Type { - name: "QtQuick.Controls.ButtonColumn" - icon: ":/componentsplugin/images/buttoncolumn16.png" - - ItemLibraryEntry { - name: "Button Column" - category: "Qt Quick - Controls" - libraryIcon: ":/componentsplugin/images/buttoncolumn.png" - version: "1.0" - requiredImport: "QtQuick.Controls" - } - } - Type { name: "QtQuick.Controls.Label" icon: ":/componentsplugin/images/label16.png" @@ -168,7 +142,7 @@ MetaInfo { ItemLibraryEntry { name: "Slider (Vertical)" category: "Qt Quick - Controls" - libraryIcon: ":/componentsplugin/images/sliderh.png" + libraryIcon: ":/componentsplugin/images/slider.png" version: "1.0" requiredImport: "QtQuick.Controls" Property { name: "orientation"; type: "Enumeration"; value: "Qt.Vertical"; } diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc index 3a8361e20b..04b2667776 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc @@ -3,10 +3,6 @@ components.metainfo images/button.png images/button16.png - images/buttoncolumn.png - images/buttoncolumn16.png - images/buttonrow.png - images/buttonrow16.png images/checkbox.png images/checkbox16.png images/combobox.png @@ -19,20 +15,12 @@ images/radiobutton16.png images/slider.png images/slider16.png - images/sliderh.png - images/sliderh16.png images/label.png images/label16.png - images/tabbar.png - images/tabbar16.png - images/tabbutton.png - images/tabbutton16.png images/textarea.png images/textarea16.png images/textfield.png images/textfield16.png - images/toolbar.png - images/toolbar16.png images/window.png images/window16.png images/column-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png deleted file mode 100644 index 3cf3c11ddb..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png deleted file mode 100644 index 15e7f442a6..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png deleted file mode 100644 index 4cd7ad590a..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png deleted file mode 100644 index 2e6083c1c8..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/button.png b/src/plugins/qmldesigner/componentsplugin/images/button.png index 96e45e7233..da994e512a 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/button.png and b/src/plugins/qmldesigner/componentsplugin/images/button.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/button16.png b/src/plugins/qmldesigner/componentsplugin/images/button16.png index 5f550f968e..9d0d3f69ac 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/button16.png and b/src/plugins/qmldesigner/componentsplugin/images/button16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/buttoncolumn.png b/src/plugins/qmldesigner/componentsplugin/images/buttoncolumn.png deleted file mode 100644 index b58d81bc0e..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/buttoncolumn.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/buttoncolumn16.png b/src/plugins/qmldesigner/componentsplugin/images/buttoncolumn16.png deleted file mode 100644 index 9fb324bf8a..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/buttoncolumn16.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/buttonrow.png b/src/plugins/qmldesigner/componentsplugin/images/buttonrow.png deleted file mode 100644 index 298be98fb4..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/buttonrow.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/buttonrow16.png b/src/plugins/qmldesigner/componentsplugin/images/buttonrow16.png deleted file mode 100644 index 0966da8559..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/buttonrow16.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/checkbox.png b/src/plugins/qmldesigner/componentsplugin/images/checkbox.png index 586167f65a..32f1efe09c 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/checkbox.png and b/src/plugins/qmldesigner/componentsplugin/images/checkbox.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/checkbox16.png b/src/plugins/qmldesigner/componentsplugin/images/checkbox16.png index 569ec6e2f6..5b00d5536f 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/checkbox16.png and b/src/plugins/qmldesigner/componentsplugin/images/checkbox16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/combobox.png b/src/plugins/qmldesigner/componentsplugin/images/combobox.png index ba363fd3ce..e1993cc970 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/combobox.png and b/src/plugins/qmldesigner/componentsplugin/images/combobox.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/combobox16.png b/src/plugins/qmldesigner/componentsplugin/images/combobox16.png index 09d74c8c20..b0a536ebb7 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/combobox16.png and b/src/plugins/qmldesigner/componentsplugin/images/combobox16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/item-icon.png b/src/plugins/qmldesigner/componentsplugin/images/item-icon.png index fc53d38ae7..4fa106118c 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/item-icon.png and b/src/plugins/qmldesigner/componentsplugin/images/item-icon.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/item-icon16.png b/src/plugins/qmldesigner/componentsplugin/images/item-icon16.png index 7d2d7a5050..fb2c9b2ed6 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/item-icon16.png and b/src/plugins/qmldesigner/componentsplugin/images/item-icon16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/label.png b/src/plugins/qmldesigner/componentsplugin/images/label.png index 9c90cc4403..bc4cea1738 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/label.png and b/src/plugins/qmldesigner/componentsplugin/images/label.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/label16.png b/src/plugins/qmldesigner/componentsplugin/images/label16.png index b744ef0eea..236ad9b158 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/label16.png and b/src/plugins/qmldesigner/componentsplugin/images/label16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/progressbar.png b/src/plugins/qmldesigner/componentsplugin/images/progressbar.png index b9c3ebf244..b137ef7beb 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/progressbar.png and b/src/plugins/qmldesigner/componentsplugin/images/progressbar.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/progressbar16.png b/src/plugins/qmldesigner/componentsplugin/images/progressbar16.png index 77ce17a478..60da065fc1 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/progressbar16.png and b/src/plugins/qmldesigner/componentsplugin/images/progressbar16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/radiobutton.png b/src/plugins/qmldesigner/componentsplugin/images/radiobutton.png index 2b9aa4793b..7e3c28d5f4 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/radiobutton.png and b/src/plugins/qmldesigner/componentsplugin/images/radiobutton.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/radiobutton16.png b/src/plugins/qmldesigner/componentsplugin/images/radiobutton16.png index 923297a3ff..38fd6eb0b2 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/radiobutton16.png and b/src/plugins/qmldesigner/componentsplugin/images/radiobutton16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/slider.png b/src/plugins/qmldesigner/componentsplugin/images/slider.png index d62d0b7af9..a3bcd2cd6c 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/slider.png and b/src/plugins/qmldesigner/componentsplugin/images/slider.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/slider16.png b/src/plugins/qmldesigner/componentsplugin/images/slider16.png index 104f648fe1..9b71fa55d6 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/slider16.png and b/src/plugins/qmldesigner/componentsplugin/images/slider16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/sliderh.png b/src/plugins/qmldesigner/componentsplugin/images/sliderh.png deleted file mode 100644 index c0bb24596d..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/sliderh.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/sliderh16.png b/src/plugins/qmldesigner/componentsplugin/images/sliderh16.png deleted file mode 100644 index 94df1a0337..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/sliderh16.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/tabbar.png b/src/plugins/qmldesigner/componentsplugin/images/tabbar.png deleted file mode 100644 index 5683dc4184..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/tabbar.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png b/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png deleted file mode 100644 index b91390fec9..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/tabbutton.png b/src/plugins/qmldesigner/componentsplugin/images/tabbutton.png deleted file mode 100644 index 28cca26326..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/tabbutton.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/tabbutton16.png b/src/plugins/qmldesigner/componentsplugin/images/tabbutton16.png deleted file mode 100644 index aee09a0a34..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/tabbutton16.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/textarea.png b/src/plugins/qmldesigner/componentsplugin/images/textarea.png index 388a5c5786..55a0c40d6b 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/textarea.png and b/src/plugins/qmldesigner/componentsplugin/images/textarea.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/textarea16.png b/src/plugins/qmldesigner/componentsplugin/images/textarea16.png index 736f646803..647517a1ad 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/textarea16.png and b/src/plugins/qmldesigner/componentsplugin/images/textarea16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/textfield.png b/src/plugins/qmldesigner/componentsplugin/images/textfield.png index a5c77b3a72..d9f6ff03c7 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/textfield.png and b/src/plugins/qmldesigner/componentsplugin/images/textfield.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/textfield16.png b/src/plugins/qmldesigner/componentsplugin/images/textfield16.png index d3a8a52bd1..ced8ee86f9 100644 Binary files a/src/plugins/qmldesigner/componentsplugin/images/textfield16.png and b/src/plugins/qmldesigner/componentsplugin/images/textfield16.png differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/toolbar.png b/src/plugins/qmldesigner/componentsplugin/images/toolbar.png deleted file mode 100644 index 91b335082d..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/toolbar.png and /dev/null differ diff --git a/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png b/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png deleted file mode 100644 index dd2d5af1cb..0000000000 Binary files a/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png and /dev/null differ -- cgit v1.2.1 From 659950e95d2b1b88d4d07f1c1d18a75f3873f2cf Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 21 Jul 2016 15:07:40 +0200 Subject: Doc: Using Ctrl+N and Ctrl+P shortcuts to navigate in locator Change-Id: I290f148e5a7ceba42d3fe17a70ec59efcb774aef Reviewed-by: Alessandro Portale --- doc/src/editors/creator-editors.qdoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index 7ac3dfaeaa..9d7e28f186 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -2537,6 +2537,11 @@ \key Space. The prefix is usually a single character. Then type the search string (typically, a filename or class name) or the command to execute. + You can also double-click a locator filter in the filter list to use it. You + can use the up and down arrow keys or the \key Ctrl+P and \key Ctrl+N + keyboard shortcuts to move up and down the list, and then press \key Enter + to use the selected filter. + For example, to locate symbols matching QDataStream: \list 1 -- cgit v1.2.1 From efe1e70ea26b52527d8e08c730d5a29447af524d Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 26 Jul 2016 16:50:11 +0200 Subject: Doc: Update info about QML file wizards Change-Id: I71a6f068c1b310bf2038379afde63c1ad32652a6 Reviewed-by: Thomas Hartmann --- doc/src/projects/creator-projects-creating.qdoc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 29bc9b1bd7..f3cd4557a8 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -302,12 +302,9 @@ application executable \li QML files, which specify items in Qt Quick projects. - \uicontrol {Qt Quick 1} creates a QML file that imports Qt Quick 1.1 and - \uicontrol {Qt Quick 2} creates a QML file that imports Qt Quick 2.0. - Select \uicontrol {Qt Quick 1} to add files to a Qt Quick 1 application - and \uicontrol {Qt Quick 2} to add files to a Qt Quick 2 application. - \uicontrol {Qt Quick UI File} creates an UI form (\e .ui.qml) and - the corresponding QML file. + \uicontrol {QML File (Qt Quick 2)} creates a QML file that imports + Qt Quick 2.0 and \uicontrol {Qt Quick UI File} creates an UI form + (\e .ui.qml) and the corresponding QML file. \li JavaScript files that you can use to write the application logic in Qt Quick projects -- cgit v1.2.1 From 412c221ddc8d263afeafcbe050e9b17e0c71bf9c Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 27 Jul 2016 10:33:53 +0200 Subject: Doc: Describe Qt item model wizard Change-Id: I22256c3060623a8350a96a56274d5cb2fc2504bb Reviewed-by: Alessandro Portale --- doc/src/projects/creator-projects-creating.qdoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index f3cd4557a8..85ce180319 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -295,6 +295,10 @@ \list + \li Qt item model source and header files that you can use to create + classes derived from QAbstractItemModel, QAbstractTableModel, or + QAbstractListModel. + \li \QD forms and \QD form classes, which specify parts of user interfaces in Qt widget based projects -- cgit v1.2.1 From 55466483cb484e7364ef2e23aedd656206a0a175 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 28 Jul 2016 16:16:47 +0200 Subject: Doc: Update descriptions of Qt Quick Application wizards Some fields are only available in some wizards. Change-Id: Ibecca943fcd5ce8bdc131896762093c1918d56cd Reviewed-by: Tim Jenssen Reviewed-by: Thomas Hartmann --- doc/src/qtquick/qtquick-creating.qdoc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 19c61dbd0b..7b1e09a09c 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -92,16 +92,18 @@ \uicontrol {Qt Quick Controls Application}, or \uicontrol {Qt Labs Controls Application} > \uicontrol Choose. - \li In the \uicontrol {Minimal required Qt version} field, select the Qt - version to develop with. The Qt version determines the Qt Quick - imports that are used in the QML files. + \li For some Qt Quick applications, you must select the Qt version to + develop with in the \uicontrol {Minimal required Qt version} field. + The Qt version determines the Qt Quick imports that are used in the + QML files. - \li Select the \uicontrol {With .ui.qml file} check box to create an UI + \li For some Qt Quick applications, you can select the + \uicontrol {With .ui.qml file} check box to create an UI form that can contain a subset of the QML language. Similarly as with the UI forms for \QD, it is recommended that you use \QMLD to edit the UI forms. For more information, see \l{Qt Quick UI Forms}. - \li For a Qt Quick Controls application, you can also select the + \li For some Qt Quick applications, you can also select the \uicontrol {Enable native styling} check box. \QC adds a dependency to the Qt Widgets module to the \c .pro file. -- cgit v1.2.1 From 7ad279e99d3e9cb7ba24739b60acc3ff1daeb226 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 28 Jul 2016 16:22:18 +0200 Subject: Doc: Update Qt Quick Designer connection editor docs - Update the screenshot - Use "select" instead of "specify", because items and properties can be selected from lists. Change-Id: I292f7900d956c682e3f4b6071bbef9a6362cc6be Reviewed-by: Tim Jenssen Reviewed-by: Thomas Hartmann --- doc/images/qmldesigner-bindings.png | Bin 5852 -> 4919 bytes doc/src/qtquick/qtquick-connection-editor.qdoc | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/images/qmldesigner-bindings.png b/doc/images/qmldesigner-bindings.png index 723fe3ea11..ebe24eb758 100644 Binary files a/doc/images/qmldesigner-bindings.png and b/doc/images/qmldesigner-bindings.png differ diff --git a/doc/src/qtquick/qtquick-connection-editor.qdoc b/doc/src/qtquick/qtquick-connection-editor.qdoc index 236d3f9bbc..a9ff30855b 100644 --- a/doc/src/qtquick/qtquick-connection-editor.qdoc +++ b/doc/src/qtquick/qtquick-connection-editor.qdoc @@ -108,13 +108,13 @@ \li Select \uicontrol Item to select the target object whose property you want to change dynamically. - \li Select \uicontrol Property to specify the property to bind to a source + \li Select \uicontrol Property to select the property to bind to a source property. - \li Select \uicontrol {Source Item} to specify the object whose property you + \li Select \uicontrol {Source Item} to select the object whose property you want to use to determine the behavior of the target object. - \li Select \uicontrol {Source Property} to specify the property to bind the + \li Select \uicontrol {Source Property} to select the property to bind the target property to. \endlist -- cgit v1.2.1 From 1d61239bb9d23cf3d4c1cab7aefd9bffd990bf05 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Fri, 29 Jul 2016 10:20:36 +0200 Subject: QmlDesigner: readd the flag to fix a crash Also this is necessary to be at the right middle position of QtCreator. Change-Id: I691002b7ed5a29a1ea2094f62aba121b2a2e458e Task-number: QTCREATORBUG-16673 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/documentwarningwidget.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp index 0c55a61835..d816db3264 100644 --- a/src/plugins/qmldesigner/documentwarningwidget.cpp +++ b/src/plugins/qmldesigner/documentwarningwidget.cpp @@ -52,6 +52,9 @@ DocumentWarningWidget::DocumentWarningWidget(QWidget *parent) , m_ignoreWarningsCheckBox(new QCheckBox(this)) , m_continueButton(new QPushButton(this)) { + // this "tooltip" should behave like a widget with parent child relation to the designer mode + setWindowFlags(Qt::Widget); + QFont boldFont = font(); boldFont.setBold(true); m_headerLabel->setFont(boldFont); -- cgit v1.2.1 From a13875daf55eb574500125339126312a03040018 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Fri, 29 Jul 2016 11:45:17 +0200 Subject: QmlDesigner: disable validator for source property column The source column can have contain real code so disable the validator and trimm the expression because it is compared with the already trimmed source in the rewriter. Change-Id: I0cc684f8446799e3bd4ee77a8a9bb8077164f3b9 Reviewed-by: Thomas Hartmann --- .../qmldesignerextension/connectioneditor/bindingmodel.cpp | 2 +- .../qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp | 6 ++++++ .../qmldesigner/qmldesignerextension/connectioneditor/delegates.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp index 273d2ea977..11e03384fb 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp @@ -308,7 +308,7 @@ void BindingModel::updateExpression(int row) RewriterTransaction transaction = connectionView()->beginRewriterTransaction(QByteArrayLiteral("BindingModel::updateExpression")); try { - bindingProperty.setExpression(expression); + bindingProperty.setExpression(expression.trimmed()); transaction.commit(); //committing in the try block } catch (Exception &e) { m_exceptionError = e.description(); diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp index 74fdd455ae..e53e2fc1c8 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp @@ -71,6 +71,11 @@ void PropertiesComboBox::setText(const QString &text) setEditText(text); } +void PropertiesComboBox::disableValidator() +{ + setValidator(0); +} + ConnectionComboBox::ConnectionComboBox(QWidget *parent) : PropertiesComboBox(parent) { } @@ -163,6 +168,7 @@ QWidget *BindingDelegate::createEditor(QWidget *parent, const QStyleOptionViewIt } break; case BindingModel::SourcePropertyNameRow: { bindingComboBox->addItems(model->possibleSourceProperties(bindingProperty)); + bindingComboBox->disableValidator(); } break; default: qWarning() << "BindingDelegate::createEditor column" << index.column(); } diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.h b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.h index 640cc1f757..581e59c3f9 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.h +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.h @@ -42,6 +42,7 @@ public: virtual QString text() const; void setText(const QString &text); + void disableValidator(); }; class ConnectionComboBox : public PropertiesComboBox -- cgit v1.2.1 From 09cbe5621d38503f6f9dfc491355aebae015e6fa Mon Sep 17 00:00:00 2001 From: Nazar Gerasymchuk Date: Fri, 29 Jul 2016 14:55:58 +0300 Subject: ProjectExplorer: Fix tab order in CustomParserConfigDialog For unknown reasons tab order in customparserconfigdialog.ui was set incorrectly and behave unexpectedly. Now tab order behave naturally. Change-Id: Ife117dd0dfd8c583e4bfe6b1191bdcae65bad05b Reviewed-by: Tim Jenssen --- src/plugins/projectexplorer/customparserconfigdialog.ui | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/customparserconfigdialog.ui b/src/plugins/projectexplorer/customparserconfigdialog.ui index b79dbe3285..7901db4e9b 100644 --- a/src/plugins/projectexplorer/customparserconfigdialog.ui +++ b/src/plugins/projectexplorer/customparserconfigdialog.ui @@ -429,8 +429,17 @@ errorFileNameCap errorLineNumberCap errorMessageCap + errorStdOutChannel + errorStdErrChannel errorOutputMessage - buttonBox + tabWidget + warningPattern + warningFileNameCap + warningLineNumberCap + warningMessageCap + warningStdOutChannel + warningStdErrChannel + warningOutputMessage -- cgit v1.2.1 From c8020af9972ddc71be291f98ecfb97f5edda7a66 Mon Sep 17 00:00:00 2001 From: Nazar Gerasymchuk Date: Fri, 29 Jul 2016 12:45:14 +0300 Subject: ProjectExplorer: Fix tab order in projectwizardpage.ui For unknown reasons tab order in projectwizardpage.ui was set incorrectly and behave unexpectedly. Now tab order behave naturally. Change-Id: I56dd70234b6ebd734b5893f50d4f7255c23639d8 Reviewed-by: Tim Jenssen --- src/plugins/projectexplorer/projectwizardpage.ui | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/projectexplorer/projectwizardpage.ui b/src/plugins/projectexplorer/projectwizardpage.ui index 37e53de2a2..d42fb7edeb 100644 --- a/src/plugins/projectexplorer/projectwizardpage.ui +++ b/src/plugins/projectexplorer/projectwizardpage.ui @@ -135,6 +135,12 @@
utils/treeviewcombobox.h
+ + projectComboBox + addToVersionControlComboBox + vcsManageButton + scrollArea + -- cgit v1.2.1 From ad49e64ff00259fc1967768695dd5e5a0ee65c96 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 27 Jul 2016 14:48:42 +0200 Subject: CppTools: Cancel parsing if editor is closed The m_parserFuture.cancel() in ~BuiltinEditorDocumentProcessor() did not cancel anything. Thus, closing a document while the parser was running led to a blocking UI thread. Now it cancels at the next include directive it encounters. Change-Id: I092fddbbd747e0bc95265b6e9b4fcc26b3f76cb3 Reviewed-by: Friedemann Kleint Reviewed-by: Tim Jenssen --- src/libs/cplusplus/pp-engine.cpp | 8 ++++++++ src/libs/cplusplus/pp-engine.h | 6 ++++++ src/plugins/clangcodemodel/clangeditordocumentparser.cpp | 3 ++- src/plugins/clangcodemodel/clangeditordocumentparser.h | 3 ++- src/plugins/cpptools/baseeditordocumentparser.cpp | 9 ++++++++- src/plugins/cpptools/baseeditordocumentparser.h | 7 +++++-- src/plugins/cpptools/baseeditordocumentprocessor.cpp | 2 +- src/plugins/cpptools/builtineditordocumentparser.cpp | 7 ++++++- src/plugins/cpptools/builtineditordocumentparser.h | 3 ++- src/plugins/cpptools/cppsourceprocessor.cpp | 5 +++++ src/plugins/cpptools/cppsourceprocessor.h | 3 +++ 11 files changed, 48 insertions(+), 8 deletions(-) diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 134fb4d51c..6a414d8b0f 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -762,6 +762,11 @@ QByteArray Preprocessor::run(const QString &fileName, return preprocessed; } +void Preprocessor::setCancelChecker(const Preprocessor::CancelChecker &cancelChecker) +{ + m_cancelChecker = cancelChecker; +} + bool Preprocessor::expandFunctionlikeMacros() const { return m_expandFunctionlikeMacros; @@ -1636,6 +1641,9 @@ void Preprocessor::handlePreprocessorDirective(PPToken *tk) void Preprocessor::handleIncludeDirective(PPToken *tk, bool includeNext) { + if (m_cancelChecker && m_cancelChecker()) + return; + m_state.m_lexer->setScanAngleStringLiteralTokens(true); lex(tk); // consume "include" token m_state.m_lexer->setScanAngleStringLiteralTokens(false); diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index b265de6d46..19935b2c7d 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -56,6 +56,8 @@ #include #include +#include + namespace CPlusPlus { class Environment; @@ -81,6 +83,9 @@ public: QByteArray run(const QString &filename, const QByteArray &source, bool noLines = false, bool markGeneratedTokens = true); + using CancelChecker = std::function; + void setCancelChecker(const CancelChecker &cancelChecker); + bool expandFunctionlikeMacros() const; void setExpandFunctionlikeMacros(bool expandFunctionlikeMacros); @@ -253,6 +258,7 @@ private: Client *m_client; Environment *m_env; QByteArray m_scratchBuffer; + CancelChecker m_cancelChecker; bool m_expandFunctionlikeMacros; bool m_keepComments; diff --git a/src/plugins/clangcodemodel/clangeditordocumentparser.cpp b/src/plugins/clangcodemodel/clangeditordocumentparser.cpp index 97939dd92c..129c0669a6 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentparser.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentparser.cpp @@ -35,7 +35,8 @@ ClangEditorDocumentParser::ClangEditorDocumentParser(const QString &filePath) setConfiguration(config); } -void ClangEditorDocumentParser::updateHelper(const CppTools::WorkingCopy &) +void ClangEditorDocumentParser::updateHelper(const QFutureInterface &, + const CppTools::WorkingCopy &) { State state_ = state(); state_.projectPart = determineProjectPart(filePath(), configuration(), state_); diff --git a/src/plugins/clangcodemodel/clangeditordocumentparser.h b/src/plugins/clangcodemodel/clangeditordocumentparser.h index 65da483e2f..848e31f125 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentparser.h +++ b/src/plugins/clangcodemodel/clangeditordocumentparser.h @@ -37,7 +37,8 @@ public: ClangEditorDocumentParser(const QString &filePath); private: - void updateHelper(const CppTools::WorkingCopy &) override; + void updateHelper(const QFutureInterface &future, + const CppTools::WorkingCopy &) override; }; } // namespace ClangCodeModel diff --git a/src/plugins/cpptools/baseeditordocumentparser.cpp b/src/plugins/cpptools/baseeditordocumentparser.cpp index 4a216e17ae..ee3b8bec5c 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.cpp +++ b/src/plugins/cpptools/baseeditordocumentparser.cpp @@ -77,9 +77,16 @@ void BaseEditorDocumentParser::setConfiguration(const Configuration &configurati } void BaseEditorDocumentParser::update(const WorkingCopy &workingCopy) +{ + QFutureInterface dummy; + update(dummy, workingCopy); +} + +void BaseEditorDocumentParser::update(const QFutureInterface &future, + const WorkingCopy &workingCopy) { QMutexLocker locker(&m_updateIsRunning); - updateHelper(workingCopy); + updateHelper(future, workingCopy); } BaseEditorDocumentParser::State BaseEditorDocumentParser::state() const diff --git a/src/plugins/cpptools/baseeditordocumentparser.h b/src/plugins/cpptools/baseeditordocumentparser.h index 3822394c61..328fe421fd 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.h +++ b/src/plugins/cpptools/baseeditordocumentparser.h @@ -29,6 +29,7 @@ #include "cppworkingcopy.h" #include "projectpart.h" +#include #include #include @@ -39,7 +40,7 @@ class CPPTOOLS_EXPORT BaseEditorDocumentParser : public QObject Q_OBJECT public: - using Ptr = QSharedPointer;; + using Ptr = QSharedPointer; static Ptr get(const QString &filePath); struct Configuration { @@ -58,6 +59,7 @@ public: void setConfiguration(const Configuration &configuration); void update(const WorkingCopy &workingCopy); + void update(const QFutureInterface &future, const WorkingCopy &workingCopy); ProjectPart::Ptr projectPart() const; @@ -76,7 +78,8 @@ protected: mutable QMutex m_stateAndConfigurationMutex; private: - virtual void updateHelper(const WorkingCopy &workingCopy) = 0; + virtual void updateHelper(const QFutureInterface &future, + const WorkingCopy &workingCopy) = 0; const QString m_filePath; Configuration m_configuration; diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp index f32d79ed77..82aa058b90 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.cpp +++ b/src/plugins/cpptools/baseeditordocumentprocessor.cpp @@ -77,7 +77,7 @@ void BaseEditorDocumentProcessor::runParser(QFutureInterface &future, return; } - parser->update(workingCopy); + parser->update(future, workingCopy); CppToolsBridge::finishedRefreshingSourceFiles({parser->filePath()}); future.setProgressValue(1); diff --git a/src/plugins/cpptools/builtineditordocumentparser.cpp b/src/plugins/cpptools/builtineditordocumentparser.cpp index 014252b13d..8ab6a89101 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.cpp +++ b/src/plugins/cpptools/builtineditordocumentparser.cpp @@ -55,7 +55,8 @@ BuiltinEditorDocumentParser::BuiltinEditorDocumentParser(const QString &filePath qRegisterMetaType("CPlusPlus::Snapshot"); } -void BuiltinEditorDocumentParser::updateHelper(const WorkingCopy &theWorkingCopy) +void BuiltinEditorDocumentParser::updateHelper(const QFutureInterface &future, + const WorkingCopy &theWorkingCopy) { if (filePath().isEmpty()) return; @@ -181,6 +182,10 @@ void BuiltinEditorDocumentParser::updateHelper(const WorkingCopy &theWorkingCopy if (releaseSourceAndAST_) doc->releaseSourceAndAST(); }); + sourceProcessor.setCancelChecker([future]() { + return future.isCanceled(); + }); + Snapshot globalSnapshot = modelManager->snapshot(); globalSnapshot.remove(filePath()); sourceProcessor.setGlobalSnapshot(globalSnapshot); diff --git a/src/plugins/cpptools/builtineditordocumentparser.h b/src/plugins/cpptools/builtineditordocumentparser.h index c2eb4c86ee..94ae556574 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.h +++ b/src/plugins/cpptools/builtineditordocumentparser.h @@ -58,7 +58,8 @@ public: static Ptr get(const QString &filePath); private: - void updateHelper(const WorkingCopy &workingCopy) override; + void updateHelper(const QFutureInterface &future, + const WorkingCopy &workingCopy) override; void addFileAndDependencies(CPlusPlus::Snapshot *snapshot, QSet *toRemove, const Utils::FileName &fileName) const; diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp index f238a841f7..e04d977ebf 100644 --- a/src/plugins/cpptools/cppsourceprocessor.cpp +++ b/src/plugins/cpptools/cppsourceprocessor.cpp @@ -121,6 +121,11 @@ CppSourceProcessor::CppSourceProcessor(const Snapshot &snapshot, DocumentCallbac CppSourceProcessor::~CppSourceProcessor() { } +void CppSourceProcessor::setCancelChecker(const CppSourceProcessor::CancelChecker &cancelChecker) +{ + m_preprocess.setCancelChecker(cancelChecker); +} + void CppSourceProcessor::setWorkingCopy(const WorkingCopy &workingCopy) { m_workingCopy = workingCopy; } diff --git a/src/plugins/cpptools/cppsourceprocessor.h b/src/plugins/cpptools/cppsourceprocessor.h index fdebc893c6..84ea034347 100644 --- a/src/plugins/cpptools/cppsourceprocessor.h +++ b/src/plugins/cpptools/cppsourceprocessor.h @@ -59,6 +59,9 @@ public: CppSourceProcessor(const CPlusPlus::Snapshot &snapshot, DocumentCallback documentFinished); ~CppSourceProcessor(); + using CancelChecker = std::function; + void setCancelChecker(const CancelChecker &cancelChecker); + void setWorkingCopy(const CppTools::WorkingCopy &workingCopy); void setHeaderPaths(const ProjectPartHeaderPaths &headerPaths); void setLanguageFeatures(CPlusPlus::LanguageFeatures languageFeatures); -- cgit v1.2.1 From 3bd9dbf5b274ed28d604387f2bc68d6a204900e8 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 20 Jul 2016 17:12:58 +0200 Subject: QmlDesigner: Adding testproject for directory imports Change-Id: Ib9f4feb745722dc1e43c6651ed1cfc4a017818e7 Reviewed-by: Tim Jenssen --- .../directoryimport/directory/MyComponent.qml | 34 +++++++++++++++++++ .../directoryimport/directoryimport.qml | 38 ++++++++++++++++++++++ .../directoryimport/directoryimport.qmlproject | 20 ++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 tests/manual/qml/testprojects/directoryimport/directory/MyComponent.qml create mode 100644 tests/manual/qml/testprojects/directoryimport/directoryimport.qml create mode 100644 tests/manual/qml/testprojects/directoryimport/directoryimport.qmlproject diff --git a/tests/manual/qml/testprojects/directoryimport/directory/MyComponent.qml b/tests/manual/qml/testprojects/directoryimport/directory/MyComponent.qml new file mode 100644 index 0000000000..4af155d3b9 --- /dev/null +++ b/tests/manual/qml/testprojects/directoryimport/directory/MyComponent.qml @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Window 2.2 + +Rectangle { + width: 20 + height: 20 + color: "#2630de" +} diff --git a/tests/manual/qml/testprojects/directoryimport/directoryimport.qml b/tests/manual/qml/testprojects/directoryimport/directoryimport.qml new file mode 100644 index 0000000000..40ae676513 --- /dev/null +++ b/tests/manual/qml/testprojects/directoryimport/directoryimport.qml @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +import QtQuick 2.3 +import "directory" + +Item { + + width: 640 + height: 480 + + MyComponent { + + + } +} diff --git a/tests/manual/qml/testprojects/directoryimport/directoryimport.qmlproject b/tests/manual/qml/testprojects/directoryimport/directoryimport.qmlproject new file mode 100644 index 0000000000..0d3f618138 --- /dev/null +++ b/tests/manual/qml/testprojects/directoryimport/directoryimport.qmlproject @@ -0,0 +1,20 @@ +/* File generated by Qt Creator */ + +import QmlProject 1.1 + +Project { + mainFile: "plugins.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + importPaths: [ "imports" ] +} -- cgit v1.2.1 From dfd3568a70d291a23e8aa7382fa9c549693bb837 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 29 Jul 2016 11:57:45 +0200 Subject: Doc: Update screenshots of Qt Quick Designer Connections pane Change-Id: Icb85ac30145b2897b4a9c9e83e476337bae3f8f2 Reviewed-by: Tim Jenssen --- doc/images/qmldesigner-borderimage-bindings-text.png | Bin 6569 -> 5220 bytes doc/images/qmldesigner-borderimage-bindings.png | Bin 5170 -> 4103 bytes doc/images/qmldesigner-borderimage-connections.png | Bin 5006 -> 3802 bytes doc/images/qmldesigner-borderimage-properties.png | Bin 5474 -> 4146 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/images/qmldesigner-borderimage-bindings-text.png b/doc/images/qmldesigner-borderimage-bindings-text.png index 6484c13f01..9a1e47c52d 100644 Binary files a/doc/images/qmldesigner-borderimage-bindings-text.png and b/doc/images/qmldesigner-borderimage-bindings-text.png differ diff --git a/doc/images/qmldesigner-borderimage-bindings.png b/doc/images/qmldesigner-borderimage-bindings.png index 78a82b7f56..1955f74567 100644 Binary files a/doc/images/qmldesigner-borderimage-bindings.png and b/doc/images/qmldesigner-borderimage-bindings.png differ diff --git a/doc/images/qmldesigner-borderimage-connections.png b/doc/images/qmldesigner-borderimage-connections.png index e37adb6924..caaa7a7236 100644 Binary files a/doc/images/qmldesigner-borderimage-connections.png and b/doc/images/qmldesigner-borderimage-connections.png differ diff --git a/doc/images/qmldesigner-borderimage-properties.png b/doc/images/qmldesigner-borderimage-properties.png index 1a51b61a25..9f8628eba1 100644 Binary files a/doc/images/qmldesigner-borderimage-properties.png and b/doc/images/qmldesigner-borderimage-properties.png differ -- cgit v1.2.1 From ecbd1fa408ceb8732fe7bb87477de3006d3b7b95 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 29 Jul 2016 13:08:51 +0200 Subject: Doc: Update creating components and screens with Qt Quick Designer Add dependency to the Qt Quick Controls 2 docs Change-Id: Idcbb856cf38d8867dc781ade572cf18f87983912 Reviewed-by: Tim Jenssen --- doc/config/qtcreator-project.qdocconf | 1 + doc/src/qtquick/qtquick-components.qdoc | 5 ++++- doc/src/qtquick/qtquick-screens.qdoc | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index 9fa6d3167d..d31caa91b5 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -38,6 +38,7 @@ indexes += $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \ $QDOC_INDEX_DIR/qtgui/qtgui.index \ $QDOC_INDEX_DIR/qthelp/qthelp.index \ $QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \ + $QDOC_INDEX_DIR/qtquickcontrols2/qtquickcontrols2.index \ $QDOC_INDEX_DIR/qtquickextras/qtquickextras.index \ $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \ $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \ diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index facf937564..dbc41d57f8 100644 --- a/doc/src/qtquick/qtquick-components.qdoc +++ b/doc/src/qtquick/qtquick-components.qdoc @@ -90,6 +90,9 @@ when compared to Qt Quick Controls, on which the module is based. These types work in conjunction with Qt Quick and Qt Quick Layouts. + Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and + Qt Labs Controls. + Some ready-made controls, such as a gauge, dial, status indicator, and tumbler, are provided by the \l {Qt Quick Extras} module. @@ -104,7 +107,7 @@ \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > - \uicontrol {Files and Classes} > \uicontrol Qt > \uicontrol {QML File (Qt Quick 1)} or + \uicontrol {Files and Classes} > \uicontrol Qt > \uicontrol {QML File (Qt Quick 2)} > \uicontrol Choose to create a new .qml file. diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc index aa6429345d..cc76d9f2f2 100644 --- a/doc/src/qtquick/qtquick-screens.qdoc +++ b/doc/src/qtquick/qtquick-screens.qdoc @@ -57,6 +57,9 @@ when compared to Qt Quick Controls, on which the module is based. These types work in conjunction with Qt Quick and Qt Quick Layouts. + Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and + Qt Labs Controls. + \section1 Adding Components to Screens \list 1 -- cgit v1.2.1 From 7c3f61f8198743684ef655ff3fd486fde5a7466c Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 29 Jul 2016 14:08:48 +0200 Subject: QmlDesigner: Fix regular expression We have to use a non capturing group for the optional 'Id'. Change-Id: I59431d78908a16f571febdf14c57bfe079ca6817 Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 47f4315aa7..72bfe1a78a 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -189,7 +189,7 @@ bool QmlObjectNode::isTranslatableText(const PropertyName &name) const if (modelNode().metaInfo().isValid() && modelNode().metaInfo().hasProperty(name)) if (modelNode().metaInfo().propertyTypeName(name) == "QString" || modelNode().metaInfo().propertyTypeName(name) == "string") { if (modelNode().hasBindingProperty(name)) { - static QRegExp regularExpressionPatter(QLatin1String("qsTr(|Id)\\((\".*\")\\)")); + static QRegExp regularExpressionPatter(QLatin1String("qsTr(?:|Id)\\((\".*\")\\)")); return regularExpressionPatter.exactMatch(modelNode().bindingProperty(name).expression()); } @@ -202,7 +202,7 @@ bool QmlObjectNode::isTranslatableText(const PropertyName &name) const QString QmlObjectNode::stripedTranslatableText(const PropertyName &name) const { if (modelNode().hasBindingProperty(name)) { - static QRegExp regularExpressionPatter(QLatin1String("qsTr(|Id)\\(\"(.*)\"\\)")); + static QRegExp regularExpressionPatter(QLatin1String("qsTr(?:|Id)\\(\"(.*)\"\\)")); if (regularExpressionPatter.exactMatch(modelNode().bindingProperty(name).expression())) return regularExpressionPatter.cap(1); } else { -- cgit v1.2.1 From 5c5197d19d31a7c81f5bfb64a666b589bbd5638c Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 29 Jul 2016 14:07:30 +0200 Subject: QmlDesigner: Adding debugging operator to BindingProperty This is required to output the expression in the DebugView. Change-Id: I3ce0bf4a916e30e8c86c224e305fa1c4af337489 Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/include/bindingproperty.h | 3 +++ .../qmldesigner/designercore/model/bindingproperty.cpp | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/include/bindingproperty.h b/src/plugins/qmldesigner/designercore/include/bindingproperty.h index 345dbf4514..a530cb203f 100644 --- a/src/plugins/qmldesigner/designercore/include/bindingproperty.h +++ b/src/plugins/qmldesigner/designercore/include/bindingproperty.h @@ -58,4 +58,7 @@ protected: bool compareBindingProperties(const QmlDesigner::BindingProperty &bindingProperty01, const QmlDesigner::BindingProperty &bindingProperty02); +QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const BindingProperty &property); +QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const BindingProperty &AbstractProperty); + } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp index 68b71da381..018075da66 100644 --- a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp @@ -244,4 +244,22 @@ void BindingProperty::setDynamicTypeNameAndExpression(const TypeName &typeName, model()->d->setDynamicBindingProperty(internalNode(), name(), typeName, expression); } +QDebug operator<<(QDebug debug, const BindingProperty &property) +{ + if (!property.isValid()) + return debug.nospace() << "BindingProperty(" << PropertyName("invalid") << ')'; + else + return debug.nospace() << "BindingProperty(" << property.name() << " " << property.expression() << ')'; +} + +QTextStream& operator<<(QTextStream &stream, const BindingProperty &property) +{ + if (!property.isValid()) + stream << "BindingProperty(" << PropertyName("invalid") << ')'; + else + stream << "BindingProperty(" << property.name() << " " << property.expression() << ')'; + + return stream; +} + } // namespace QmlDesigner -- cgit v1.2.1