Commit Graph

31927 Commits

Author SHA1 Message Date
Eike Ziller 56c3d8ffab Unify wizards with TOC and cancel button.
QTBUG-28385 is biting us over and over (QWizard doesn't have close
button nor cancel button on Mac in Qt 5), and actually there's no reason
for us having a wizard without the features from Utils::Wizard.

Task-number: QTCREATORBUG-10346
Task-number: QTBUG-28385
Change-Id: I80c0d82fe6738496c2ac03c31a1c2757ade8e266
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-09 14:31:14 +02:00
Christian Kandeler 1ba9c8ef14 Update qbs submodule.
Change-Id: Iaf666a75e16834028ff7a830a24423aadfc7d1f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-09 14:08:20 +02:00
David Schulz 36552d17ea Pass ShortcutOverride events to base class in BaseTextEditorWidget.
Task-number: QTCREATORBUG-9820
Change-Id: I34493bf655cc2c5bc21d6dadbe2cf668093cfa0a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-09 13:28:44 +02:00
Thomas Hartmann 523276bb25 QmlDesigner.PropertyEditor: adding GridSpecifics
Change-Id: I3b793929e130d6eac8bb818f593b1617d1a0f168
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 12:46:08 +02:00
Thomas Hartmann ee4fd52ade QmlDesigner.PropertyEditor: adding RowSpecifics
Change-Id: I1883e33d2d169f54e352a131f11dce4fa4c86748
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 12:45:56 +02:00
Thomas Hartmann b3fd3dfbde QmlDesigner.PropertyEditor: fixing caption for BorderImage
Change-Id: I592220d716caddb174ee041c079b94de3bdbe831
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 12:45:48 +02:00
Thomas Hartmann d816aaa0f9 QmlDesigner.PropertyEditor: adding FlowSpecifics
Change-Id: I75bc5fbb1b5d69e82afe2c2f7170da363c184fa9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 12:45:41 +02:00
Thomas Hartmann 962189c377 QmlDesigner.PropertyEditor: adding ColumnSpecifics
Change-Id: Ia5f0ae7b3a9d34e3e9e0d9df01dbc2f74887b0d1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 12:45:31 +02:00
Thomas Hartmann 4b9c8fecc8 QmlDesigner.PropertyEditor: Also style SliderSpinBox
Moving the spin box style into its own component so it can
be shared.

Change-Id: I7e838a487c89106590e87eac6c725f68ce9c50f9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 11:40:35 +02:00
Thomas Hartmann ca478ae3cf QmlDesigner.PropertyEditor: no gradient editing for TextEdit
Change-Id: I88fa53ca7d963c33a464f0cdc259a95d00a3be56
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 11:38:02 +02:00
Thomas Hartmann b2bbb6e629 QmlDesigner.PropertyEditor: fixing styling of ColorButton
Change-Id: I1acef0eaf569a49e5a9226cead7dbccd4c9abf95
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 11:37:51 +02:00
Thomas Hartmann 59126cd996 QmlDesigner.PropertyEditor: addding ImageSpecfics
Change-Id: I9933434803535cb871408a1e02bad00cbd5c83dd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 11:37:37 +02:00
Thomas Hartmann 4778e656fb QmlDesigner.PropertyEditor: no gradient editing for TextInput
Change-Id: I5144424abbcac188398118a71fcc33ffb494b6fb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 11:37:25 +02:00
Thomas Hartmann 800876bde9 QmlDesigner.PropertyEditor: adding BorderImageSpecifics
Change-Id: I4577472ad6c8ff430f2784f33a1a6506ba55ff3e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 11:37:03 +02:00
Thomas Hartmann 18b22e8d76 QmlDesigner.PropertyEditor: styling empty pane
Change-Id: I5910b9a8c4f734fe50f7c8ed5d863e181be2894c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 11:36:48 +02:00
Thomas Hartmann 9be820785a QmlDesigner.PropertyEditor: no gradient editing for Text
Change-Id: I049b265118ab3d6a6da88631e235d5faa4568866
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 11:36:41 +02:00
Daniel Teske 911226bf97 Android: Removing qt should remove its kits
Task-number: QTCREATORBUG-10224
Change-Id: I3d360a095ef76674e762e5bd795f21ab21685953
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-09 11:34:49 +02:00
Orgad Shaneh e4c7511eeb CppEditor: Accept const Function in FunctionHelper
Change-Id: Id21c958c1528c5cbdb507aa3fc297bd14bcfb13e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-09 11:33:32 +02:00
Eike Ziller 6889547fe1 Mac: Fix size of disk image in the hope of avoiding resize problem
diskimages-helper: resize request is above maximum size allowed.

Change-Id: I6cc8da465d99fdb971d5e66090163464c85ccec1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-09 11:22:48 +02:00
David Schulz e9433fe17c Core: Adding Utils to Libs for the app subproject.
Needed because of I696133c42a142a8c596703fc8ce0250b58993d99

Change-Id: I947a76399cff30a0031064258f302cc8ec1ae50f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-09 10:41:42 +02:00
Thomas Hartmann 2e1acc119f QmlDesigner.PropertyEditor: styling ComboBox
Change-Id: I2de6d06dcc89e845eedd087671a6a4c9df7b62f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 10:02:20 +02:00
Thomas Hartmann a3b3d25c1d Cleanup
remove accidentally committed file.

Change-Id: I956f50d6390e8d502f47a89892bf318ca276e170
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 09:13:35 +02:00
Oswald Buddenhagen cb002194b8 exclude .pluginspec from 'make clean'
'clean' per qmake's definition means "all intermediate artifacts are
gone". the target is supposed to be still runnable/installable.

Task-number: QTCREATORBUG-10323
Change-Id: Ic0d6482c7534367753661e80ccd5f55bd0446545
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-09 08:31:59 +02:00
Orgad Shaneh b7914379b3 Fix Qt version warning
Change-Id: I0738620fe3e1b8d02b681d4bc743c6fd233e6b89
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-09 08:30:09 +02:00
Yuchen Deng 4ba08300f7 qbs: Remove unnecessary depends
Change-Id: I124eec5eb9c0eadd7b883725f3aaedaceadcab0a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-09 02:30:51 +02:00
Thomas Hartmann 59d3da2c3b QmlDesigner.PropertyEditor: styling ButtonRow
Change-Id: If366216813566ef806494cee3b49e06b85711865
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-08 17:30:33 +02:00
Thomas Hartmann 7839817110 QmlDesigner.PropertyEditor: fixing text label in LayoutSection
Change-Id: Ia0a065da9f24de81147a9ae7d939654e24f0862c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-08 17:22:00 +02:00
Thomas Hartmann 7849a363ff QmlDesigner.PropertyEditor: adding missing qsTr()
Change-Id: Ifcda7118cce9858af4670d60d902868c9e45e90a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-08 17:21:51 +02:00
Orgad Shaneh f47c101b8b Revert "EditorManager: Fix crash when closing an editor upon activation"
Deleting an editor while currentEditorChanged is apparently not a good
idea.
Use a queued connection instead.

This reverts commits 243a625961,
447c4ed37f,
d9602ca550 and
3103487038.

Change-Id: Iccbee25fb77714963faa6f7184d1f5f53ed348a6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-08 17:09:55 +02:00
Eike Ziller 171fd691c3 Ios: Fix crash when connecting user-mode device
The modal dialog was opened directly from the tool output processing,
and when returning the tool handler was already deleted.

Change-Id: Iacba584b59bf8720788ac03fd2e839c5e4485ab3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-08 15:42:19 +02:00
Fawzi Mohamed c65c650cc2 ios: disable debug print of probe progress
Change-Id: I867c3f2881fd6882458c92fa84fbc9668ba6a538
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-08 15:29:20 +02:00
Friedemann Kleint a833ba350a Fix some spelling/tr-errors in Android/QNX.
Change-Id: Ia9f927c7b4108046d03158de0aa6d94026f1cfde
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-08 15:24:13 +02:00
Orgad Shaneh 2e15e54d95 Fix MSVC warning
basetexteditor.cpp:6013: warning: C4189: 'ts' : local variable is
initialized but not referenced

Change-Id: Ia5d6531f8dab8debbb41da79f1cdf152ee831676
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-08 13:38:17 +02:00
Eike Ziller 32bf281a79 Mac: Try to work around the re-occurring disk image creation error
A guess is that hdiutil finishes even though the system is not yet quite
finished with the image (e.g. still unmounting?), so introducing a small
timer.
Also turn on verbosity, so this error might be better trackable if it
occurs again.

Change-Id: I0acb23bbac408f2979c8cacf2fc58fdff782fc3d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-08 13:12:27 +02:00
Leena Miettinen bd9c842a38 Doc: restructure UI design section
Remove graphics and combine some short topics to
put more weight on Qt Quick development instead of
generic UI development.

Change-Id: Ief2041022e0ccb407c26b0742825613223082f0a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-08 13:02:17 +02:00
Eike Ziller 5bc6f9cee1 Merge remote-tracking branch 'origin/2.8' into 3.0
Conflicts:
	src/plugins/projectexplorer/editorconfiguration.cpp

Change-Id: Iff7eccd9386c1f5d870e40f1e033dfef2cb0bf87
2013-10-08 11:55:17 +02:00
Eike Ziller 8ba52466c5 Always use display names in locator context menu.
Task-number: QTCREATORBUG-10340

Change-Id: I442811a66c3f1a54343dadacbcfa633c18632584
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-08 11:49:45 +02:00
Thomas Hartmann 0ae420d0ec WelcomePage: redesign of welcome page
Change-Id: Iec777d4fcf86f1807e17a5be777698b64ce15555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-08 11:13:23 +02:00
Thomas Hartmann 647726fd5d WelcomePage: remove getting started page
The getting started page is not part redesign, anymore.

Change-Id: Iec779d4fcf86f1800e17a5b7775698b64ce16555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-08 11:13:16 +02:00
Eike Ziller dfaec0632a Update minimum required Qt version.
We require Qt 5.2 for full functionality nowadays.
It is possible to use Qt 4.8.x with restrictions.
(Qt 5.0 and 5.1 do not work because of problems with embedding
Qt Quick 2 and other Qt Quick related issues (e.g. QTCREATORBUG-10273)

Change-Id: Ib41576e8b8e3727e87141eaf0351d63158730524
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-08 10:32:15 +02:00
Leena Miettinen 9fbf0ac1b0 Doc: Bare Metal Devices plugin
This topic needs more information about the
necessary Qt version and the "fake Qt" mentioned.
Also, I cannot try this in practice myself, so
steps might be missing.

Change-Id: I143a54b8559840c3e9ad6dd5d293de160d67867d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-07 21:18:46 +02:00
hjk 0db5579592 CPlusPlus: Fix parsing of <: :> <% %> %: digraphs
See 2.5/2.12. Most useful feature ever.

Change-Id: I3f92256733e15078df56205dba9746ffff8ed145
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-07 21:06:18 +02:00
hjk 2187195995 CPlusPlus: Remove unneeded utf-8 roundtrip.
Change-Id: Iae3dcba305bac8a632c1ae94586fd687509ed92d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-07 21:05:54 +02:00
hjk 4258715731 CPlusPlus: Make Environment::hashCode more local.
The function call itself shows in the critical path. Let's shave
off a few cycles by making it easier inlinable.

Change-Id: I14b06de27e99fa00f3be757193f2037792b18e01
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-07 21:05:31 +02:00
Fawzi Mohamed ffa61e4ced ios-sim: fix for for 10.6
Change-Id: I9528b031c80eb59016a4d10f98d315aa0944e21f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-07 18:39:38 +02:00
Rainer Keller 92f9d286ab Fix path calculation for Boot to Qt
Change-Id: I090bfe935c0c69e7689449ef2b76aff7273445a5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-07 16:54:26 +02:00
Eike Ziller c05e9d52b2 Ios: Move tools to <libexec>/ios, make them lowercase, fix deployment
They can't be directly in libexec path, because then they couldn't have
their own qt.conf for resolving the Cocoa platform plugin.

Change-Id: I8f3fae85c548747a7d826c078c7ac1fb0a836b43
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-07 15:32:10 +02:00
Thomas Hartmann 810274d038 WelcomePage: Bring back the tutorials page
The tutorials page was removed during refactoring.

Change-Id: Iec779d4fcf86f1807e17a5be775698b64ce16655
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-07 14:06:44 +02:00
Leena Miettinen b32d7f4c90 Doc: fix link to deploying to BB10 topic
The title was wrong, which was causing the fixnavi
script to fail.

Change-Id: I631c8f3dcdbebbe3ee4f6bc003986929da0813c6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-07 13:58:41 +02:00
Eike Ziller 1a7f77c6b7 Make the pattern used for installers overridable
Change-Id: If34cd0edcf50884ffaee8879628acaa019a432ac
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-10-07 13:36:32 +02:00