Commit Graph

4240 Commits

Author SHA1 Message Date
Eike Ziller
86378da3be Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	src/plugins/debugger/debuggeroptionspage.cpp

Change-Id: I0282d66b16c14877d0131cccbe03573102b48bc3
2015-03-05 13:28:15 +01:00
Leena Miettinen
53a29f5b83 Doc: fix remaining links to Qt wiki in docs
Change-Id: Ia9193cf1870241104bf099ad2e47e3ead4eb43fd
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-04 10:49:37 +00:00
hjk
6288d2833b Debugger: Remove 'Remote' qualification from 'Debug Server'
While using the Debug Server typically does involve a remotely running
debug server (GDBServer or other stub) it's also possible and sometimes
useful to use it locally.

Change-Id: I7b041b14cc09d15ae3e6b501c9298f78764e256d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-03 14:10:25 +00:00
Sergio Ahumada
3af3fe7ad3 Replace old qt-project.org wiki with wiki.qt.io
Change-Id: Ie7518d57b62e3f0b9dc6c559fe4a8f5b0212bb43
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-03 09:35:41 +00:00
Eike Ziller
767f0ef58b Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb
2015-02-25 10:15:28 +01:00
hjk
4699a33837 Coding style: Allow empty lambda parameter lists to be omitted
Change-Id: I6d4e53c5e16b1f25db62a4996fcc3b0298abd720
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-24 17:26:12 +00:00
Tobias Hunger
6c49356471 JsonWizard: Allow for descriptions of wizards
Allow for descriptions of project wizards that will be displayed in the
Project location page.

Task-number: QTCREATORBUG-13924
Change-Id: I7d65aba0e07f074cc0935318cff9b93f166a1c51
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-24 14:56:21 +00:00
Ulf Hermann
8b8f8ca2ba Allow QML profiling when using Qt Quick compiler
Change-Id: I40784b51e36c3c77fce6bf077613d19579336db6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-19 10:09:07 +00:00
Sergio Ahumada
e84770b794 Adapt documentation URL
Change-Id: I74963a9d4a729450341f4f7a4ae5b3583654ffb8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-18 12:38:23 +00:00
Eike Ziller
56aadc407d Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
2015-02-12 17:36:29 +01: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
Lorenz Haas
a51acf42ef CppEditor: Create only getter or setter member function
In addition to create both getter and setter member functions at once it
can now be decided to only create a getter or setter member function.

Task-number: QTCREATORBUG-13874
Change-Id: I9127a31b7d87dc91619abb2e2335bd8221f170a2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-09 15:53:22 +00:00
Tobias Hunger
96e3f258d6 JsonWizard: Document isBinary flag for the file generator
Task-number: QTCREATORBUG-13930
Change-Id: I3294919f83f0f4f3ee7e4473db7c1336f730c076
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-05 13:29:37 +00:00
Kai Koehne
582ad0fc3f Allow tweaking of environment for external tools
Task-number: QTCREATORBUG-4995
Change-Id: If8a6f6715165cf12809ae9c2a3a629bc4f464c16
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-29 13:21:26 +00:00
Leena Miettinen
110392ad18 Doc: fix bug in doc building instructions
And add a note about the new online style.

Change-Id: I4d16ea45dd121a27c5c8d8c0fe5e5b971f8c2d05
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-29 13:15:59 +00:00
Lorenz Haas
f08266497e CppEditor: Add new QuickFix MoveAllFuncDefOutside
This QuickFix behaves like MoveFuncDefOutside except it moves all
member function definitions. It is triggered on the class name.

Change-Id: I1393a51cad521a7bb58a1ed6223ab0fe4db0e592
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-26 17:52:40 +01:00
Tobias Hunger
3956fab1dd Coding style: Fix broken characters
Somebody inserted a fancy version of '"':-)

Change-Id: Ic96d5e821f4c5ad58cec80c6a5225ae24454239a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-22 14:19:40 +01:00
Thomas Hartmann
bd91f82a73 Doc: Mention limitation for .ui.qml files in the Open Source version.
Change-Id: I8b4e4853072dccb95d3313837e6fa83e7bb76021
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-19 17:39:22 +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
Christian Kandeler
c0670b120b Update qbs submodule and do the necessary adjustments.
Namely:
    - Expose the new build options in the UI and document them.
    - Remove the default deployment step.

Change-Id: Ic2c9fd93276ab925effe327fac38642d2153f6cc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-01-09 17:20:48 +01:00
Eike Ziller
b5b47f7df2 Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
2015-01-08 10:38:20 +01:00
Leena Miettinen
e6f9443394 Doc: fix broken links to Qt 5 reference docs
Some titles had changed and the hash mark references
do not seem to work anymore.

Change-Id: I4ebb877a483eff0a11c32932cc84b6e15935dcec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-07 11:36:36 +01:00
Leena Miettinen
48cfedf438 Doc: fix a broken link
A section title changed.

Change-Id: I514a7dd3d89cf0d042d10acc027edbbcc94859c8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-07 10:37:46 +01:00
Leena Miettinen
3b86184d12 Doc: adding JSON-based custom wizards
Task-number: QTCREATORBUG-13642
Change-Id: Ie3af0d4bdef33364cc442449ccfb5e770c0c3a99
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-07 10:21:07 +01:00
hjk
0d9fa1c714 Coding Style: Clarify the use of the Q_OBJECT macro
The old definition sounded like strong but was qualified by an big
'if' at the end, resulting in stating the obvious for a single case
("use it when you need it for qobject_cast").

Having the reminder there is ok, if it is a common thing to forget,
but it should be recognizable as such, and can include "the other
case" where it is typically used.

Change-Id: I0183a12d14c414db9ff8b19598cb9dd22cedda8e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-06 11:35:01 +01:00
hjk
ab1ae75ba7 Coding Style: Mention preference for Qt5-style connects
Change-Id: I7bcae5c87a6588b1817a1f8038471eebeb5ba2b9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-05 17:03:03 +01:00
Eike Ziller
487b05dba8 Adapt bugtracker URL
Change-Id: I93a256f18e720edb0bcfc2b409c119abfdcf2a2b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2014-12-19 10:18:23 +01:00
Leena Miettinen
4243c24754 Doc: replace remaining \gui commands with \uicontrol
Missed the Extending Qt Creator Manual the last time I did this.

Change-Id: I33b9b59ef204d0f7c6a5f98665c4839c6646c9b1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-18 09:31:51 +01:00
Leena Miettinen
ce8ad44692 Doc: fix changed UI string in docs and update screenshot
Change-Id: I1edd879e7389467fbeee0cb0c78c65900a7fa1dd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-17 17:11:33 +01:00
Volker Vogelhuber
779f38bded allow out of tree cmake deployment configurations
Change-Id: I78c7e46372ea7a5c1651c420f66c0ce6326d7297
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-12-16 16:19:46 +01:00
Mitch Curtis
7692addd71 Fix desing typo.
Change-Id: I3357b57a034e0c5445e7c1d66e6c0d6b89b18b7a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-12-15 12:32:09 +01:00
Leena Miettinen
c046898d94 Doc: replace \gui commands with \uicontrol
Also in master.

Change-Id: I284e57c0fe12cbc1252871aef3c6b3f50054eb79
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-15 10:38:24 +01:00
Leena Miettinen
36f8765596 Doc: prepare for describing JSON-based wizards
Move XML-wizard specific information into a separate file.

Change-Id: I7fe80c28747fa20d274eae7d3bf0b65f3624fd20
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-12-12 15:08:41 +01:00
Eike Ziller
e07f33db93 Merge remote-tracking branch 'origin/3.3'
Conflicts:
	doc/src/editors/creator-coding-edit-mode.qdoc
	doc/src/qtquick/qtquick-creating.qdoc
	qtcreator.pri
	qtcreator.qbs

Change-Id: I46e5e35419d2871f455f1df8094c5438d34e570b
2014-12-12 13:42:42 +01:00
Leena Miettinen
e1fbeedcd4 Doc: use \uicontrol command instead of \gui macro
Change-Id: Idc898b6ac70b6d3186d353086b5f3e45830d1f83
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-12-12 10:26:59 +01:00
Leena Miettinen
c9696aa6f4 Doc: use a checkmark icon in tables
Where a yes/no selection is needed.

Change-Id: I4f72ca19c109710c5b1a40a84393350c31650b87
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-12 09:50:45 +01:00
hjk
7e8fb3a9e9 QmlProjectManager: Disable by default
It's not the preferred way of operation nowadays and harms startup
times. People who find the plugin useful can still enable it.

Change-Id: I8328f8e8085103d4469bbd7016b86218b4b238b7
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-12 08:32:27 +01:00
Leena Miettinen
c7f1eed9b6 Doc: replace "Enterprise" with "commercial only"
Change-Id: If07c5ee18e93d32085a9f617ba18ff7abf5a95b3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-11 13:50:25 +01:00
Leena Miettinen
d99cb730a0 Doc: add platform notes for the UI
The manual usually uses the Windows/Linux names and locations
for functions and dialogs. Add information to help OS X users
to follow the instructions.

Task-number: QTCREATORBUG-13626
Change-Id: I7e91b1d52ab580d89feae8564240e759845260e9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-11 11:26:00 +01:00
Leena Miettinen
cc543bb387 Doc: viewing item hierarchy while debugging Qt Quick 2
When debugging Qt Quick 1, you right-click to open a
context menu, but for Qt Quick 2, it has been changed
to double-clicking to cycle through the item stack.

Task-number: QTCREATORBUG-13617
Change-Id: I3b36c76a54a24cbd102cd8ffa2bf5da2d12bef26
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-11 11:25:50 +01:00
Leena Miettinen
72e7687bd4 Doc: selecting simulated iOS device in run settings
Change-Id: I1f35456c9f628fb8cf53f75f8278a18966a7dcaa
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-11 11:24:33 +01:00
Eike Ziller
541d00453a Merge remote-tracking branch 'origin/3.3'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp
	src/shared/qbs

Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
2014-12-10 13:20:02 +01:00
Leena Miettinen
dffd2866b3 Doc: add missing info about sidebar views in Qt Quick Designer
As it turns out that we have a sidebar also in the Design mode,
with partly the same views as in the Edit and Debug modes, I
added info about the missing views and fixed the terminology.

Change-Id: I997d472548781a466bec3e64dbf28ecb1476b3eb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-12-04 12:36:28 +01:00
Leena Miettinen
d0dac2e9fd Doc: resetting QML code model
Change-Id: Iaa1764c419bdb05c3d24bc2e3e2ea29130c96633
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-04 12:26:31 +01:00
Leena Miettinen
71612e14d7 Doc: update screenshot of C++ class wizard
The dialog looks different and its name changed.

Change-Id: Ied3b3135734089447fc4638eb7216f7dc0d09bee
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-04 11:40:32 +01:00
Leena Miettinen
15a18c83d9 Doc: Qt Quick Designer extensions
Move the documentation for commercial features from a separate
manual to the Qt Creator Manual.

Change-Id: Ifc8f10bda4a2a234e4b81f812601ce2ceb104ddd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-12-04 11:09:08 +01:00
Kai Koehne
0dfb84da9e Add ANGLE library to Acknowledgements
Change-Id: I2f3b7a3c2bf185adbf4e97d82cf8e5f8d9164736
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-04 07:52:48 +01:00
Leena Miettinen
77fa127519 Doc: fix typo speficying > specifying
Change-Id: I8520bcf7a1e6300b53822082f8376113bd02713a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-12-03 17:15:33 +01:00
Eike Ziller
d341c48246 Merge remote-tracking branch 'origin/3.3' 2014-12-01 15:44:30 +01:00
Leena Miettinen
95afdf6c38 Doc: QML_PUPPET_MODE env variable
The variable was added for checking whether a QML plugin
is run in Design mode or by an application.

Task-number: QTCREATORBUG-12439
Change-Id: Iad99b7279c8191cb8b17ca81ff24fb9db731fdc9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-12-01 11:31:37 +01:00