Commit Graph

4987 Commits

Author SHA1 Message Date
Thomas Hartmann
b50b7d20d9 QmlDesigner.PropertyEditor: Give more space to color LineEdit
Task-number: QTCREATORBUG-11992

Change-Id: Icb884847633bd421e3dc7bc034d598ef84d33422
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-07 16:27:39 +02:00
Eike Ziller
48b8947dc2 qml(2)puppet: Avoid ugly logic with generating Info.plist file
The Info.plist was generated for putting the Qt Creator version into it.
Since that is not very useful nor necessary information, we can just
avoid the whole generation, and make the logic much simpler.

Change-Id: I71a12dc7e53970e3ef136e8abc78077dfba3326e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-07 13:49:27 +02:00
hjk
ef4388d43b Debugger: Fix pointer arithmetic in lldbbridge.py
Cut-and-past-o in a currently unused code path.

Change-Id: I2c690e5010ade7f3ebbb4a94163d7b44da13c10d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-07 12:28:22 +02:00
hjk
26d5059961 Debugger: More robust Qt version extraction with LLDB
Change-Id: I1c690e5010ade7f3ebbb4a94163d7b44da13c10d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-04 16:14:01 +02:00
hjk
d8adc10fbe Debugger: More direct way to extract dynamic QObject properties
This avoids the address == -1 problem for generated
values with LLDB.

Change-Id: I13cfc7387d8e5329b588d6d841cd9c2322270363
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-04 11:00:00 +02:00
hjk
78d2e274b7 Debugger: Robustify QSet and QHash dumpers
Change-Id: I6d4df7f00719e5f7c4ee2f41c890348ab9aeaa8a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-03 13:41:30 +02:00
hjk
b5f4678846 Debugger: Handle failing inferior calls more gracefully
At least for GDB on Windows that's a rather typical situation due to
GDB's "Internal error: pc in read in psymtab, but not in symtab"

Task-number: QTCREATORBUG-11164

Change-Id: If79d586b59e2c1ee37558e8a811091fefc69ac2d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-03 13:41:21 +02:00
Christian Stenger
eabf4628c9 Debugger: Use tested offsets in QFile dumper
Change-Id: I6c45d9ebcfa7705ba0913cd1c3ff30798758c473
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-03 12:13:08 +02:00
Eike Ziller
d68f14ad5b Merge remote-tracking branch 'origin/3.1' 2014-04-03 10:16:14 +02:00
Alessandro Portale
248180da15 Welcome: developer.qtc.io --> qtcloudservices.com
Change-Id: I748cb2d6e3b810728e4138f2b0983931233105a5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-02 17:06:01 +02:00
Robert Loehning
bde0571b74 Fix missing white space in German translation
Change-Id: I0b4db6f76befed238427f7fbf51fd73446dbb773
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-04-02 15:53:43 +02:00
Alessandro Portale
57f11f40d6 Welcome: Store examples search text in settings
in QtCreator.ini under "WelcomePage/ExamplesSearchString".
The installer pre-set that setting, and in that way pre-
select a set of examples.

Change-Id: I8ac5a38ad0bd3f33875ef1997ccbf0352410dcc3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-02 14:03:32 +02:00
Eike Ziller
cab8e4aa03 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
2014-04-02 13:24:34 +02:00
hjk
18b91ae4ec Debugger: Move putPlainChildren() to Dumper base
It's reusable...

Change-Id: I1a0f40b9b3bbecf99024d3a2fd5148baf604109b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-02 11:03:43 +02:00
hjk
50459e5713 Debugger: Use target not host architecture in QDateTime dumper
Task-number: QTCREATORBUG-11164

Change-Id: I83bd56f91c1e5342e1a755638c794dde7f5b345a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-02 11:00:22 +02:00
hjk
c5dd58fce5 Debugger: Use tested offsets in QDateTime dumper
Task-number: QTCREATORBUG-11164
Change-Id: I9184e2f14baa3d3d649839f25088dbd0a01a3496
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-01 16:48:55 +02:00
Leena Miettinen
2301025c1d Doc: update the Android tutorial to also cover iOS
Rename as "Creating a Mobile Application".
Add the steps necessary for deploying to iOS devices.
Fix the link in the Tutorials tab in the Welcome mode.

Change-Id: Ie72bf087c789d8d1299b9b5ac19ad732da534012
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-04-01 14:01:36 +02:00
hjk
7932a9ddbc Debugger: More robust metaobject extraction
Change-Id: I359cbdcfb0594b988e041c06efa44c6fd85a8d65
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-01 12:38:55 +02:00
Friedemann Kleint
edddfba98a German translations for 3.1
Change-Id: I4ce52075140220c70ef3d25df1321454a01a0c0f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-31 18:09:20 +02:00
Eike Ziller
90f8de5c8a Examples: Move example combo box to the left
That makes it more visible, which is especially important when we show
example sets that do not come from a Qt version there.

Change-Id: Ib99955e70abb95053d9e8cd718ab599153e6eaaf
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-31 12:30:30 +02:00
Eike Ziller
29b0c1022c WelcomePage: Support additional (non-qt) example sets
Added with setting "Help/InstalledExamples" which is a string list, each
string is a triple of (display name, manifest parse path, examples
path), joined with '|'.
If a documentationPath for a Qt version is already added through the
InstalledExamples setting, we do not show an extra combo box item for
it. That makes it possible for an installer to register a single example
set for the same Qt version in different variants (e.g. iOS, Android
x86, Android arm)

Change-Id: I42dd8f9ca9cb6cee247e3dc8ce9d014e56852e79
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-31 12:30:11 +02:00
Orgad Shaneh
9229873c94 Update generic highlighter definitions
... from kate revision 8216cd38

And add Makefile definition file

Change-Id: I41c43543957f6e5bd9084af100524321c1b4b74d
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-03-28 09:24:08 +01:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
El Mehdi Fekari
866157960a Qnx: Update bar-descriptor templates
* Qt4: Remove unnecessary input and update the style to bb10dark.
* Qt5: Update the environment variables default values
to cover common use cases.
* Cascades: Remove unnecessary LD_LIBRARY_PATH input

Change-Id: I339ae02639621adf291f5d3c9a02a242460f0c39
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
2014-03-27 17:06:22 +01:00
hjk
f92e04374a Debugger: Speed up Qt namespace detection in non-Qt projects
Task-number: QTCREATORBUG-10610
Change-Id: Idc5a93625fa4a148864709a1cefbcbbab877a8a2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-27 16:53:11 +01:00
hjk
2d8f1247fc Debugger: Use direct version access in QMap dumper
We rely on the Qt version being correct elsewhere anyway, so no
need to use another approach here.

Change-Id: I6a3eb450bf6841c9a301b24e035aa3152186d7a5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-27 13:50:50 +01:00
hjk
186570a259 Debugger: Fix jump to line with LLDB
Typos and interpreted languages...

Change-Id: I15c197176ade1800474fb1581ef6333ffb2752e1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-27 13:09:43 +01:00
Orgad Shaneh
311868a696 Debugger: Support p1 on Windows
Change-Id: Id634dc37b2708f9cb88e5b01ff758d5adcde215e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-26 15:15:57 +01:00
Thomas Hartmann
dbff333229 WelcomePage: Fixing missing images and warnings
The property help source was always defined.

The actual reason for the warnings was that we did not check
if model.imageUrl is undefined and java script turns an undefined
value into the string "undefined".

Change-Id: Ifb433ff5cdc3142ff5e552ff1b01b04b1a859590
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-26 14:10:53 +01:00
Thomas Hartmann
150803bc31 QmlDesigner.PropertyEditor: Fix echo mode
TextEdit does not have an echoMode property
and for TextField it has to be an integer.

Task-number: QTCREATORBUG-11136
Change-Id: Ib560dd18ed31f9a735fd2c6874334e1479fd3a31
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-25 17:52:11 +01:00
Thomas Hartmann
c3e027e5b0 WelcomePage: Fix warning if searching in examples
During search/filtering the model returns undefined values
for delegates.

Task-number: QTCREATORBUG-11579
Task-number: QTCREATORBUG-11847

Change-Id: Ia15acd54991373f5bdebe4407e4f4a39503f6966
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-25 17:19:09 +01:00
hjk
5f16194870 Debugger: Add test for dynamic QObject property dumper
Change-Id: I3216a8f891b76a5e9d342aa97540fcb73c590531
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-25 16:59:15 +01:00
Marco Bubke
46c083c2eb QmlDesigner: Don't set anchors for the root item
Task-number: QTCREATORBUG-11800
Change-Id: I6d23b23f250ccef76c7b9182071770a4f4f490f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-25 15:46:19 +01:00
Leena Miettinen
357941d4ab Welcome: update icons in Tutorials tab
Remove obsolete icons and add new icons for Dev Days 12 and 13.

Change-Id: I20a315aaa13c8fcc3d440db6ecb3ca55b071047b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-24 11:09:16 +01:00
Jarek Kobus
7e8de984b2 Update Polish translations
Change-Id: Ib18ac6e8847d4d47477523165616b1c51ed39d0d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-03-21 12:04:15 +01:00
Thomas Hartmann
4997122048 WelcomePage: Fix for invisible buttons
Opacity 0 does not imply visible false anymore.

Task-number: QTCREATORBUG-11790
Change-Id: Ie5b0786d7e82399164e0b89cfeaf65f97ab357c3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-21 11:34:56 +01:00
Jarek Kobus
a6f12b3555 Replace qtquick 1.1's deployment with qrc file.
Don't generate Qt icons for Qt Quick App projects anymore.

Change-Id: Ic0fc43235a5b8da6696d5eb8d4a765d49b03dfd1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-03-20 19:59:46 +01:00
Marco Bubke
d59f5c1955 QmlDesigner: Don't instance MediaPlayer
Task-number: QTCREATORBUG-11323
Change-Id: I37629f9d6cdcb1ff12bc86ed9296e8d5af744ac4
Hotfix: 3.1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-20 18:28:02 +01:00
hjk
f7a05780d2 Debugger: Fix QObject property dumper for Qt4
Change-Id: I5aa28a3c1fb5847b758f5f1a27359cab3e38ff5c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-20 15:44:49 +01:00
Thomas Hartmann
9e466fe958 QmlDesigner.PropertyEditor: Refactor LayoutSection
Avoiding duplication of code and giving the label more space.

Change-Id: Id0988fda89b7a671be5f57e511650bd7c73c2d84
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-20 12:24:00 +01:00
hjk
4999da41f5 Debugger: Fix Qt 4 Variant dumper for extended core types
Change-Id: I5532453e0d2568b3c3d24a645b7a05aa4b579fb3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-19 20:32:58 +01:00
hjk
e9a2e4569b Debugger: Fix QXmlAttributes dumper for LLDB
Change-Id: I456424161cc80acc4057a56f62af5d33acf2eef7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-19 19:01:02 +01:00
hjk
484bacdd51 Debugger: Robustify QMetaObject extraction.
LLDB manages to extract a QAction metaobject from any
plain int and classes without any bases.

Change-Id: I22cdd8e5c73d21d837772be83087dc065698db30
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 17:07:32 +01:00
hjk
f9a7bb7bcf Debugger: More robust Qt namespace extraction for LLDB
Change-Id: I3964f15cb4295a64f91e0eb6035d365ee2b9f9bd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 13:12:11 +01:00
hjk
358500e7fc Debugger: Move LLDB state reporting to separate function
Change-Id: I4e250173efc1c0df002d2ce94f7e8df57339544b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 13:05:38 +01:00
hjk
05d7dd1bb9 Debugger: Synchronize LLDB bridge output
Output coming from spontaneous events should not interfere
with output produces by lengthy display generation.

Change-Id: I2a9e4fa93db131cfdac4cb0eb613c0159214d8be
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 12:57:07 +01:00
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
Thomas Hartmann
81b84af431 Welcomepage: session list should not be flickable
Change-Id: I663c6634960ac7704648f8fd01d85b349a0ef19d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-18 12:08:53 +01:00
hjk
5d1bc3859d Debugger: Add simple QV4::String dumper
Change-Id: Ide277128d30c4dcc5c396441ebd6e40aa3fc8b51
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-03-18 10:32:31 +01:00
Thomas Hartmann
df4a28dd40 QmlDesigner.PropertyEdior: Fixing ComboBox
If there is no enum value fall back to the instanced value.

Change-Id: Idd4654d6e9fb8d4afd3df0855861511bc06454c1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 17:38:59 +01:00