summaryrefslogtreecommitdiff
path: root/src/libs/modelinglib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.3' into 4.4Eike Ziller2017-07-281-0/+7
|\ | | | | | | Change-Id: I4876ce528e2422f63280535fe4f9dd6610a75dec
| * ModelEditor: Fix a crash moving packages into itselfJochen Becher2017-07-261-0/+7
| | | | | | | | | | | | Change-Id: I1a722b9514ee0a57d8bd8be2f4ea05ed87c6686d Task-number: QTCREATORBUG-18262 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Fix namespaced buildJoerg Bornemann2017-06-151-0/+4
| | | | | | | | | | Change-Id: Ie0f48ce209f3242f3f07b5f89e6c681f4dd7f810 Reviewed-by: hjk <hjk@qt.io>
* | Modeling: add separate function to update include dependenciesJochen Becher2017-05-318-21/+43
| | | | | | | | | | Change-Id: Icdcec9beac4b889ef22941824b993ddd2b26cf56 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Modeling: Fix a crash due to wrong order of clearing diagramJochen Becher2017-05-301-4/+4
| | | | | | | | | | Change-Id: Ibd25f230e408303f10d273d1e8d3e8c3539fbd69 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-05-042-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/debugger/tst_dumpers.cpp Change-Id: Id8b53b000f94a1b5ab923db79f67bad3276d09dc
| * Avoid some memory allocationsLaurent Montel2017-05-012-2/+2
| | | | | | | | | | | | Change-Id: I6f3cba58307babd9e34be0c3f52e25b5f67b23e3 Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Use QString::*Ref methodMontel Laurent2017-04-211-1/+1
|/ | | | | | | Change-Id: I63a10f274dd17e08b5b8a2577762cc9f7960b5af Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ModelEditor: Fix copy/paste mistakesRobert Loehning2017-04-072-2/+2
| | | | | | Change-Id: I580d3f7a97ab81fcc6aaca1b83c0f25b1d8d1ce6 Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.2' into 4.3Eike Ziller2017-03-221-1/+1
|\ | | | | | | | | | | | | Conflicts: src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp Change-Id: Ic9215ea50fdbe71610da893cc7999cc1e65b0690
| * Prepare for upcoming compile breakagev4.2.2hjk2017-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Qt 5.9 is going to break source compatibility by making the QStringRef(QString *) constructor explicit. Since the use of that constructor rather looks unintentional here, replace its use. Change-Id: I6f5f2e79f7d92f6e80a1ea0aa12126d9c88b499e Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ModelEditor: Remove dead codeRobert Loehning2017-03-211-4/+1
| | | | | | | | | | | | Change-Id: I7997edc25242c7c8ed65dfb6675e7c21cf6c70b3 Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | ModelEditor: Fix various warningsRobert Loehning2017-03-131-89/+42
| | | | | | | | | | | | Change-Id: Ibcd95304c2c59dd047481e89ac3162c74b53307b Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Convert some 0 to nullptrMontel Laurent2017-02-2312-18/+18
| | | | | | | | | | Change-Id: Ib3ca8e2cc0d63fd35582c73b3cf7c915fb64ddfb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Remove spaces in initializer listsTim Jenssen2017-02-221-3/+3
| | | | | | | | | | | | | | Format initializer lists code style like. Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013 Reviewed-by: hjk <hjk@qt.io>
* | Replace occurrences of QStringList() << patternChristian Stenger2017-02-091-5/+4
| | | | | | | | | | Change-Id: I598d8c06193c2e72435a76165d1afc9ee3465b48 Reviewed-by: hjk <hjk@qt.io>
* | Replace a few occurrences of QStringList() << ...hjk2017-02-085-16/+16
| | | | | | | | | | | | | | ... by something shorter. Change-Id: I363b4e509adb07997517b2d233246a333aea4aea Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | make library defines more consistencyTim Jenssen2016-12-123-3/+3
| | | | | | | | | | Change-Id: I211d511667d5b9c8f518bfbe750aca4483baff62 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Modeling: Fix potential nullptr accessTobias Hunger2016-12-052-14/+8
| | | | | | | | | | Change-Id: I9b8fa7de10e7fbe089c9bdde6d9f42c427ca8f82 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Orgad Shaneh2016-11-141-1/+1
|\ \ | |/ | | | | Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
| * Don't shout in text messagesJarek Kobus2016-11-041-1/+1
| | | | | | | | | | Change-Id: Ie8d2c6761c87b358f0bc8691e529ba8144e267a4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Fix dead stores in the modelinglibFrank Meerkoetter2016-11-133-3/+0
|/ | | | | | | | Found via the clang-static-analyzer Change-Id: Ic035a88d26b2a096d293133eb4638a090ac5a5c2 Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Revert "Replace virtual isModified method with a getter/setter/notifier"Jarek Kobus2016-10-214-22/+17
| | | | | | | | | | This doesn't fix the issue with cleaning the clear state of undo stack. This introduced the issue when ui file is opened it's marked as modified. It reverts 59c90e00c1e8b18d120f5b5c15b331b1ee427ace and d0c537ca759aa7facfdd0efedac5f5385d16ddb9 Change-Id: Ifd4ff8483d6c297461632de500a4502b1fd0871f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Replace virtual isModified method with a getter/setter/notifierJarek Kobus2016-10-174-17/+22
| | | | | | | We have lacked the setter and dedicated notifier before. Change-Id: I58845a48259d260c5cc90ae94b173c79cddcfef9 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'origin/4.1'Eike Ziller2016-08-311-2/+3
|\ | | | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/qmakeprojectmanager/makestep.cpp src/shared/qbs Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
| * ModelEditor: Fix translations in templatesRobert Loehning2016-08-301-2/+3
| | | | | | | | | | | | | | Change-Id: I176bcc60d70609c9623000aaa9cceb33454ad2c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Qmt: Fix lupdate errorsOrgad Shaneh2016-08-235-12/+13
| | | | | | | | | | | | | | | | | | * Exception subclasses don't declare tr * lupdate is confused by class keyword in template Change-Id: Ic89caea3bd918a1ae5dc010238503d239e293098 Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ModelingLib: refactor a bit:Nikita Baryshnikov2016-08-111-15/+15
| | | | | | | | | | | | | | | | | | QMT_CHECK are replaced with QTC_ASSERT(, return) guards to not crash operator[.*] are replaced with at(\1) Change-Id: I7e520a808550ed271ba5005dd6f5b084225ac8fe Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Remove use of deprecated Qt algorithmsOrgad Shaneh2016-08-091-1/+3
|/ | | | | Change-Id: Ib35cffa2d5762874feea9b1d4df7f569c0e5f496 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ModelEditor: Avoid corrupt diagrams after moving end of relationJochen Becher2016-07-042-0/+11
| | | | | Change-Id: If0a2a62d3ef7e59242b244d6892e83bb71315164 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ModelEditor: Avoid chrashes if model is brokenJochen Becher2016-07-044-9/+82
| | | | | | | | Add some debugging code checking integrity of diagrams. Based on the analysis avoid chrashes if ends of relations on diagrams are gone. Change-Id: I86da4a6d422de5d51e551b44e7842e992590958c Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ModelEditor: Implement zoom of diagrams.Jochen Becher2016-06-246-47/+7
| | | | | | | | | | All elements of a zoomed diagram must be dran anti-aliased. This change removes the extra handling of drawing vertical or horizontal lines without anti-alias. The complete graphics view is drawn anti-aliased instead. Change-Id: I6fc041b6d70da5a7a7bcb8e97d07990517380b90 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* qbs build: Remove some differences to qmake build results.Christian Kandeler2016-05-171-1/+1
| | | | | | | | | | | - Install library symlinks. - Do not create symlinks for plugins. - Skip some translations. - Rename some binaries. - Do not install the ptracepreload library. Change-Id: I0faa98034154e3840cd2695cab14b72c34cfc5c3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-05-032-3/+6
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/debuggerruncontrol.cpp src/plugins/projectexplorer/projectwizardpage.cpp src/plugins/projectexplorer/xcodebuildparser.h src/plugins/qmldesigner/qmldesignerplugin.cpp src/tools/clangbackend/ipcsource/translationunits.cpp Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
| * ModelEditor: Avoid crash if an illegal relation is placed on a diagram.Jochen Becher2016-05-032-3/+6
| | | | | | | | | | Change-Id: I0e62f4665c8530095d1beedc2c263d6212aa53e7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Wholesale conversion to #pragma oncehjk2016-03-30177-710/+177
|/ | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ModelEditor: Fix i18nJochen Becher2016-03-112-1/+3
| | | | | Change-Id: I6e81e22f031055c6e700e1816653f26f196dfe25 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ModelEditor: Remove unfinished relation when focus is lostJochen Becher2016-03-112-3/+14
| | | | | | Change-Id: Iee1031095845512bc69a31cbde7585e2f74ef805 Task-number: QTCREATORBUG-15799 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Modeling: Compile fix for Qt without SVGhjk2016-03-041-1/+1
| | | | | | Change-Id: Ia3ce41df63850e253643922fe5537375a4b57c3d Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Modeling: Fix build with/without SVGJochen Becher2016-02-263-55/+16
| | | | | Change-Id: I5152571010fecaf91986a16ca71bf7b89fada064 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ModelEditor: Export diagram as image, pdf or svgJochen Becher2016-02-244-9/+48
| | | | | Change-Id: I19be1de5f0c8414b4d76dbbbb68e71183b7ce08e Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ModelEditor: Destructor shall not throwJochen Becher2016-02-181-2/+2
| | | | | | Change-Id: I2a565095e841c2a6e70b04ace2cf6f7a2955b583 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* ModelEditor: Introduce factory for properties view classJochen Becher2016-02-183-4/+14
| | | | | | | | The factory allows usage of inherited view class for easy properties extensions. Change-Id: I73303a9c6f96df48dea508eadb9e829af32cdbe5 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ModelEditor: Support resorting of propertiesJochen Becher2016-02-182-37/+100
| | | | | | | The feature is not yet used but will be in one of the next changes. Change-Id: I02fa5e3649fd7c067fae89a3ff4d99610c3386b6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* ModelEditor: Fix translatabilityJochen Becher2016-02-187-24/+32
| | | | | Change-Id: I32d4573d24f30347de2f3753b973cf8e454d3378 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-19300-5382/+3912
| | | | | | | * Update remaining files in src Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ModelEditor: move 3rd_party/modeling into libs/modelinglibJochen Becher2016-01-11328-11/+44979
| | | | | | | | Only moved the files and adapted .pro and .qbs files accordingly. Change-Id: I7c17c2ebf246595c104edf60013bf78379955aa7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* QBS files: fix modelinglib build on WindowsYuchen Deng2016-01-061-0/+1
| | | | | | Change-Id: Ifcfe529e239f92a787997778b61c8efcdaccef1d Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* ModelEditor: Make item names in-place editableJochen Becher2016-01-051-0/+2
| | | | | Change-Id: Ie686e570307dcc4a980174c6b07ce5d8b7929334 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Modellinglib: Fix linking for msvc.David Schulz2015-11-162-1/+2
| | | | | | | | The Utils dependecy wasn't explicitly added to the project dependencies. Change-Id: I8f294cb2b220105c0cd83a3205594d00a051679e Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
View Lorry Controller Status