feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,758 Commits 108 Branches 368 Tags
8410c0bbad626c8ca38a161968c71a09ffb47df7
Commit Graph

37 Commits

Author SHA1 Message Date
Robert Loehning
00bb2425f5 QmlDesigner: Really prevent possible nullptr access 
c163240611 added the check for
!projectNode but then used the pointer anyway

Change-Id: Ied63fd0991b0de1dab3d19cd57c00acd596bf752
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-03-22 13:39:28 +00:00
Tobias Hunger
f9eab73dad qmake: move over from QmakeProjectNodes to QmakeParserNodes 
Change-Id: Iab87e0c248b0f651a1774336c3bddf83baa9d057
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 16:00:49 +00:00
Tobias Hunger
b697fd0db4 qmake: Use Variable enum consistently 
Change-Id: I89588f12600f0698de764c05c1930b13b53a2588
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-14 15:40:16 +00:00
Tobias Hunger
c163240611 QmlDesigner: Prevent possible nullptr access 
Change-Id: I90f131526f97fa879cf9e6428547e6e8ed9aa936
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-12-05 18:59:15 +00:00
Tobias Hunger
ad003363b7 ProjectExplorer: Rename Node::projectNode to Node::parentProjectNode 
Change-Id: I47fa794a0bd8456ae23271934a957d9667d2d7bb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-10 15:24:14 +00:00
Tobias Hunger
67e011ba5f ProjectExplorer: Make naming of methods on Nodes more consistent 
Change-Id: I5050a020f0fc0ef4556db1d2020afeadfcd51585
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-10 15:24:02 +00:00
Tobias Hunger
c9ee7ee378 ProjectExplorer: Shorten NodeType enum 
Use a class enum with a type quint16 for the NodeType. Frees 2 bytes
per node that can be used for better things now.

Change-Id: Ib84bf8629e9f4a5fb0793355eff0f0d6302167dd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-03 15:55:13 +00:00
Tim Jenssen
183395831a QmlDesigner: cleanup DocumentManager 
- move get origin properties out of the static methods
  to reduce the code

hopefully no behavior change

Change-Id: Icf903f5bcaf48ab35a9db1a779c6d9e5abcf0f80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-10-20 12:44:57 +00:00
Tim Jenssen
1dccd25794 QmlDesigner: qDeleteAll does the same 
Change-Id: I5ccb9279cfcc38455347badf61ab6ddd2ad047ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-10-12 12:26:35 +00:00
Tim Jenssen
50f5b6b5e3 QmlDesigner: no need to copy the list 
Change-Id: Ie6d5c1e7a0baaec9f6065854e451bb5d767619e6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-10-12 12:26:23 +00:00
Tim Jenssen
a29dcac4cf QmlDesigner: modernize code style 
- no behavior changes
 - using nullptr
 - renaming data -> d
 - transform single used small slot function to lambdas

Change-Id: Ifae389b8a865b0b6a501b6f3d60597a66d9febe8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-04-29 08:07:09 +00:00
Tim Jenssen
1553eb04b4 QmlDesigner: use default values at isSubclassOf 
Change-Id: Ia31d698635a9b29a023f4d919f3741ac912923b7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-04-06 10:04:55 +00:00
Friedemann Kleint
ea0c23771c DocumentManager::setCurrentDesignDocument(): Check m_currentDesignDocument. 
Fix a crash occurring when dropping a .js file onto the Widget Designer.

Task-number: QTCREATORBUG-15903
Change-Id: I3e952df1483c5683fa7daa3a1f2fb8ebbbc1b491
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-03-21 12:13:47 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Tobias Hunger
5d7f5a2a32 ProjectNode: Rename path() to filePath() 
Change-Id: I78bb73f8c9457fd74c470eacbf54eb9195ac9681
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-11-03 11:01:50 +00:00
Alessandro Portale
374f84acc7 Qt Quick Designer: License change to Qt Commercial + GPLv3 
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-09-18 12:12:57 +00:00
Thomas Hartmann
366e89e9cf QmlDesigner: Adding helper function for icon browser 
Change-Id: I6f333c897802c8bf1d93b168f5d108b77bfa33c2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-09-16 08:55:09 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Marco Bubke
771f47c0da QmlDesigner: Use Core::AsynchronousMessageBox 
Warning which needs return value should be asynchronous because the event
loop of the blocking dialog leads to crashes.

Change-Id: Ie49c95d63ec3f2183378013c726c3b99680dc7b0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2014-11-25 15:24:49 +01:00
Marco Bubke
cd5a6c4bdf QmlDesigner: Use Utils::AsynchronousMessageBox::warning 
Warning which needs return value should be asynchronous because the event
loop of the blocking dialog leads to crashes.

Change-Id: I2e348f9351611dfd053cd3fbacfb6696401ee427
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-11-24 14:45:58 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Thomas Hartmann
0b74df58a5 QmlDesigner.DocumentManager: Fix goIntoComponent for Loader 
We have have to check and handle sourceComponent and component (Tab).

Change-Id: I736648fc09fe4ee3333c4524666e3acea500804a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-04 18:48:08 +02:00
Thomas Hartmann
703a3153ed QmlDesigner.TabViewContextMenu: Remove direct dependencies 
The code for creating new files and addFileToVersionControl can be moved
to the DocumentManager.

Change-Id: I222a32f245da24d7308289a9bb6d30574da55387
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-18 14:17:19 +02:00
Marco Bubke
64f3a4dc3d QmlDesigner: Cleanup openFileComponent 
Change-Id: I740bed6dd5b7069c0ebae37a88546bd9d8e94ccc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-16 19:44:01 +02:00
Marco Bubke
a4a17121fb QmlDesigner: Add Loader source property handling 
You can know go into a component.

Change-Id: I5120e70164a112b277981fda7e603c3d327f2561
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-16 19:43:57 +02:00
Marco Bubke
fd7c110c04 QmlDesigner: Refactor component handling 
Change-Id: Iba591f255f3d9504b4613e5f712bb94b5ce7c19a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-16 19:43:49 +02:00
Thomas Hartmann
d97ef903a1 QmlDesigner.DocumentManager: Support component property of Tab 
Change-Id: Iaf2d1160904023db3c66c6e536c5cf812a71e3fb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-12 18:27:22 +02:00
Orgad Shaneh
6f5c2ea5b0 QmlDesigner: Pass const values by references 
Change-Id: I468b2bebec64680289b24044b0b4e3d5d734f604
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-22 14:15:19 +02:00
Marco Bubke
c7b1ae1ee4 QmlDesigner: Exchange QWeakPointer with QPointer 
Because we compile only with Qt 5.

Change-Id: I2c6496f37550438f7c8ccbf8af0090c525b87d8f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-13 15:00:22 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Thomas Hartmann
a1276ab0eb QmlDesigner: adding missing include 
Change-Id: I0a8d05104809cf4d1b5b806ee4e6d1675eac760c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-08-12 18:23:02 +02:00
Thomas Hartmann
934291077c QmlDesigner: remove DesignDocument::changeToExternalSubComponent() 
This function did nothing but call EditorManager::openEditor(), so we can
call it directly instead. It was not used consistently anyway.

Change-Id: I639ef346164be9260e887faac5dc6651ccfd92c5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-08-05 16:40:32 +02:00
Thomas Hartmann
a43ef07a6b QmlDesigner: move goIntoComponent() to DocumentManager. 
Move ComponentUtils::goIntoComponent() to DocumentManager.

Change-Id: I038f4c56cb1745455613a1dbdeeb8bcb927da7f3
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-08-05 15:59:57 +02:00
Friedemann Kleint
ffbbf64e29 Clean headers in QML-Designer. 
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-30 14:09:58 +02:00
Robert Loehning
a040424d2a Incremented year in copyright info 
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 09:19:26 +01:00
Marco Bubke
8d9710c074 Refactoring document handling 
The document handling in the qml designer was complicated source
code, which was initially intended for a non creator application.
To integrate new views it has to be changed and cleaned up. This
is the first major step in that direction.

Change-Id: Ie26f0aad7a03946d18bdb4c0759b246c5439d922
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2013-01-23 14:53:28 +01:00