Commit Graph

710 Commits

Author SHA1 Message Date
Leena Miettinen
8ae4602a5f Doc: update Android deployment options
Change-Id: Ie3102b4abaa496e4a08cc728effcae6362a845f4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-29 16:00:59 +02:00
Leena Miettinen
c93c699a5e Doc: selecting run environment in run settings
Change-Id: I02f2bc70733e03b9b340c37019fef5d6a7af6872
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 16:23:48 +02:00
Leena Miettinen
df882155b5 Doc: snapping to anchors in the Qt Quick Designer
Add documentation for the new button and update
the screen shots. Fix changed field names.

Change-Id: I291f63b4c87090012a3f4bf2cbbc4172e3b58aa5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-05-23 16:54:01 +02:00
Aurindam Jana
3f39943a37 CustomWizard: Add a placeholder field for QLineEdit
The XML file now has a placeholdertext attribute that sets
the place holder text for the corrsponding QLineEdit.

Change-Id: I537721a5e5be796f4f88054751e66e557e718948
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-17 16:16:38 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7'
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
2013-05-15 10:21:47 +02:00
Lorenz Haas
d288e3999b CppEditor: Quick fix "Insert (Pure) Virtual Methods"
This quick fix inserts (pure) virtual functions of base classes to the
current class. For selecting the functions which should be inserted and
for choosing the insertion mode (only declarations or with definitions
inside, outside or in the implementation file) a dialog is shown.

Task-number: QTCREATORBUG-2210
Task-number: QTCREATORBUG-2692
Task-number: QTCREATORBUG-3908
Task-number: QTCREATORBUG-5868
Task-number: QTCREATORBUG-7982
Change-Id: I8e94905afcae4778986f4c3925a494e0c6b3b8ee
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-14 09:14:25 +02:00
Tobias Hunger
df7347efe3 Doc: Remove reference to GDB for Mac
Change-Id: If0ecaf3a6e78ed0567b5392c02247282c12f3dee
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-13 12:11:48 +02:00
Lorenz Haas
15f90404aa CppEditor: InsertDefFromDecl: choose insert position
Now one can decide where the new definition should go: Inside the class,
outside the class or to the implementation file. Further the text cursor
is positioned inside the new created definition body.

Task-number: QTCREATORBUG-6973
Change-Id: I593955dd1e44e35240fa1e9b9a5c1a67eb119456
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-10 11:33:05 +02:00
Leena Miettinen
3c1b5213b5 Doc: Qt Quick Controls in Qt Creator
Describe the Qt Quick 2 UI with Controls wizard and
using controls in Qt Creator.

Change-Id: I95ba128c8dde7e0e117f649f2ff974f2c6ee624c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2013-05-10 09:53:08 +02:00
Leena Miettinen
e2b00f5cec Doc: edit text about deploying to Android
The default options for Qt 4 and Qt 5 are different.

Add background information about Android packages and
move information about specifying package settings from
the run settings topic to here.

Change-Id: I8ee0fac124e19233e85d17e1e37f060183149675
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-06 16:51:37 +02:00
Leena Miettinen
b97af0ad87 Doc: edit Android dev instructions for Qt 5.1
Separate the instructions for configuring Qt Creator
for Necessitas and Qt 5.1 to make the process clearer.
Add missing information.

Change-Id: Iac8fb1d9bcdec57783905fae2e9fea1b222d28bb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-06 09:47:21 +02:00
Lorenz Haas
7ae31f2ea9 CppEditor: Add quick fix for "Assign to Local Variable"
Adds a local variable which stores the return value of a function call
or new expression.

Task-number: QTCREATORBUG-9052
Change-Id: I1fccbdd5b9f28c8409a4b0fa24610e406de61b24
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-29 08:49:31 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
2013-04-23 11:13:25 +02:00
Leena Miettinen
48687fd8a1 Doc: fix changed field labels
Change-Id: I2a9fa92f80c51c088d855f5fec57aecacbb4bea2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-23 09:47:09 +02:00
Leena Miettinen
cf2b3f2e61 Doc: pointers to configuration options
Add short descriptions of configuration options that we get a lot
of questions about, to make it easier for users to find the information
in the Manual.

Change-Id: I9e5dca80dc99fbf9d241aba9d392ac11d784c5a7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
2013-04-19 16:03:03 +02:00
Eike Ziller
26cf7be1c3 Merge remote-tracking branch 'origin/2.7' 2013-04-19 09:05:42 +02:00
Leena Miettinen
1a35103344 Doc: make instructions for adding kits easier to find
As the Qt version and compiler are now specified in a kit, and not
in build settings any more, the instructions for adding kits, Qt
versions, and compilers should be moved up one level, directly under
"Configuring Projects". I also added some instructions and links to them
in the text. These topics could also go into "Building and Running", but
I feel they now fit quite well here.

Change-Id: Icdf436a97e824e44a5997f39a105996c5bef05dc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-18 16:05:42 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
Leena Miettinen
0bc2d64f1a Doc: add troubleshooting information to tutorial
Add links to information about adding Qt versions and
compilers and configuring kits to the "Building and
Running an Example" tutorial.

Change-Id: I57892ae6ca58ccccfda6512b2b3b9f5bce17b4da
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-17 15:57:53 +02:00
Martin T. H. Sandsmark
23bb4ff631 Custom wizard: Add setting for PathChooser's expectedKind.
Change-Id: Iff8955d0db20c5c00f8a1745ab1f4310482254cb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-17 13:26:10 +02:00
Leena Miettinen
c1261045fc Doc: default encoding set to UTF-8 in text editor
UTF-8 is required by Qt 5.

Change-Id: I7750b337296c8edf997d2610cca126530f737c37
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-16 18:31:12 +02:00
Lorenz Haas
6f3b41214b CppEditor: Add refactoring operation to move definition of a function
With this new operation it is possible to move a function definition
from a cpp file to the header file or vice versa. One can also move a
function definition outside the class body.

Task-number: QTCREATORBUG-516
Task-number: QTCREATORBUG-5364
Change-Id: Id3daefe79284bd9086282369c9d251e003951c11
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-15 17:03:49 +02:00
Leena Miettinen
f021ec50cd Doc: Android API level supported by Qt 5
Change-Id: I3822a47f98a9f2f31eda81c939b900ca5467bc51
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-15 12:14:00 +02:00
Leena Miettinen
50f7407c25 Doc: mapping source paths for debugger
Task-number: QTCREATORBUG-8656

Change-Id: Icebbd69b56aa6b47ce872957dddfcaf01868b039
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-12 17:11:07 +02:00
Friedemann Kleint
98a58c9d1f Fix documentation of the acceptRichText attribute in custom wizard.
Change-Id: Id37e8e0444124f8863c67d584a46937d7ad0af53
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-04-12 10:51:01 +02:00
Friedemann Kleint
a6112ffc4e Custom wizard: Introduce acceptRichText-property for QTextEdit.
Defaults to false (as opposed to QTextEdit's default) to
suppress formatting when pasting code from bugtrackers, etc.

Change-Id: Ib3dddd1424e56edef48bc63fb13d6c22e18a815c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-12 10:21:07 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
2013-04-11 18:27:52 +02:00
Leena Miettinen
eb3a0b0a1f Doc: fix typo: widget.xml > wizard.xml
Task-number: QTCREATORBUG-7909

Change-Id: Ib04c10559e7945efc8fc8ddb320bd1300620fd33
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-11 14:22:53 +02:00
Leena Miettinen
be085863fc Doc: XML attributes of the fieldcontrol element
Change-Id: I6ef3a730f659b7275d993d5d685d757b5adbcd93
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-09 10:46:53 +02:00
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
2013-04-08 13:26:37 +02:00
Leena Miettinen
b8acad5365 Doc: VCS information is visible in the Projects pane
If available, the name of the branch from which the project
was opened is displayed in brackets after the project name in
the Projects view in the sidebar the Edit mode.

Change-Id: Iffec0c8b1a822605f3bbd9d94a1d84aba0cda2e2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 17:18:50 +02:00
Leena Miettinen
3a51290fb9 Doc: fix misleading information about indentation
Intentation is set separately for text files that contain
C++ or QML code and other text files.

Change-Id: I5106d794ad516f745b07b0ebbb94bd4a652060d8
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-05 12:51:17 +02:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
2013-03-26 13:09:43 +01:00
Eike Ziller
6550cf4835 Update documentation on enabling the Qbs project manager.
Change-Id: Ide78109917d04464b5beb51d05599bd92182a343
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-21 16:55:17 +01:00
Eike Ziller
99b2eb1ca9 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
2013-03-18 10:19:14 +01:00
Leena Miettinen
dd4bd99c89 Doc: replace "element" with "QML type" or "item"
Try to make terminology more consistent, by using
"QML type" when describing the types, "item" when
describing instances of QML types, and "component"
when describing objects built by using QML types.

Change-Id: Ie03f3a7e6f483471e344ae1f35bec0742173b27c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-03-13 14:32:47 +01:00
Leena Miettinen
79f6e4dda7 Doc: the script console is now an output pane
Fix some remaining occurences and screenshots.

Change-Id: Ibb8d874996fe767aca180b2964559313efa8157e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-03-13 13:53:54 +01:00
Leena Miettinen
e3587e8f0d Doc: switch fixed links from Qt 4.8 to 5.0
Will look into changing automatically created links in
another patch.

Change-Id: I29b61c5301402c40d9e711762a6b57479088152b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-03-13 11:08:27 +01:00
Daniel Molkentin
2b6c79eb10 Add notes about deployment to generic linux devices
Change-Id: I00608da5000e9bb2274aae8b27dee2235d7852b8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-03-11 13:46:24 +01:00
Leena Miettinen
ce49ca841b Doc: Add Definition now works for all functions
Change-Id: Ic207120b5a4109fa8a9a521be6cb0bbbcebc8f9b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-07 17:22:15 +01:00
Rafael Roquetto
4351f1c3b1 BlackBerry key signing documentation
Change-Id: I88dd8ecb73bafa2b41d7b9051d6c95c37411fa82
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
2013-03-07 14:20:55 +01:00
Leena Miettinen
91506e974c Doc: fix links to snippets
Change-Id: If49af3120714320e850c4c60fa2fe7739850574b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-07 13:57:00 +01:00
Leena Miettinen
1da5316e5c Doc: add BlackBerry 10 to supported target platforms
Change-Id: Ie41f64e10c783baf643e1f97386db1757d0d6dd3
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-06 16:54:27 +01:00
Leena Miettinen
a9dc98572f Doc: use prepositions more consistently: "deploy to"
Change-Id: Icf84c96b7cb300ab7d208b6b4f13276ba0b3d143
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-06 16:46:07 +01:00
Leena Miettinen
a3b9c48f67 Doc: update the tutorial app to Qt Quick 2
Change-Id: I9fafe7471567ed9cffae9e86a6c7e15069b683cb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-03-06 16:42:15 +01:00
Leena Miettinen
7b7058391f Doc: new Qt Quick 2 project wizards
Change-Id: I454ba63b045928d4dcc0ebd4690a2c28cd437056
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-06 09:45:18 +01:00
Leena Miettinen
deb7005b96 Doc: kits can be added for BlackBerry 10
Change-Id: I765b3f1b58cfd17e8dfec9d43e04aebf3e403492
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-05 17:10:15 +01:00
Leena Miettinen
2e6f4d9b82 Doc: items in Issues page context menu
Remove and Show in Editor items were not
documented.

Change-Id: Iec7f2ae6ebc76f715e790de5dbb2e8dbc064b631
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-05 15:34:31 +01:00
Leena Miettinen
953201f542 Doc: fix link to previous page in Getting Started
The link should point to the front page, not the
glossary. Fixnavi somehow messes this up.

Change-Id: Ide1bf5b784874d847a9812d9705518dee6845111
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-05 14:37:46 +01:00
Leena Miettinen
f57795aaf2 Doc: remove image of Filter Files icon
The icon and text pointed to the same function,
somewhat confusingly, and the image already appears
on this page.

Change-Id: I15c317280f6689c854d541684cf0e835cc30de7b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-05 14:37:22 +01:00