Commit Graph

32683 Commits

Author SHA1 Message Date
Aurindam Jana
d349010445 QmlProfiler: Rename Label to CategoryLabel
This is to avoid confusion with generic Label
Quick component.

Change-Id: I6a72266c394862706215b6db40bcd3592f9d24b3
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-05 11:39:58 +01:00
Kai Koehne
0599cb7366 QmlProfiler: Avoid drawing outside of widget
Avoid rendering outside of the canvas by forcing the windows
size onto the scene, and also removing the related candidateSize
logic.

In the QtQUick1 based profiler one could scroll the canvas also
vertically, but that doesn't work any more. This is a hot fix
to work around the problem, we can hopefully bring back the
full solution later ...

Change-Id: Ibd3d54f6b98c3764e104116d395a77b880d88bcb
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-05 10:32:33 +01:00
Kai Koehne
33ac7e4445 QmlProfiler: Make sure UI is properly rendered
Do the QML based painting when requested inside the UI thread, and
only copy the final canvas pixmap in the renderer thread (in paint()).
To avoid excessive re-drawing delay the painting via a timer to the
next event loop run.

The previous logic was still from Qt Quick 1 times, where the paint()
method was called in the GUI thread. This has changed in Qt Quick 2:
Here the paint() method will be called (on Unix) in a separate renderer
thread, making the drawRegion / onDrawRegion connections implicitly
deferred.

Change-Id: I298547013658e4cd1e94115305577bdb96cd0b2a
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-05 10:30:22 +01:00
Kai Koehne
0d65cf11d0 QmlProfiler: Set objectNames to QmlProfilerCanvas instances
Helps debugging ...

Change-Id: I9d6508e05e5f581f7d43f4b015fcfd4596f5d5ec
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-05 10:29:34 +01:00
David Kaspar
851b2bd1ef Qnx: executing instead of parsing bbndk-env script file
QnxUtils::qnxEnvironmentFromNdkFile() function was parsing the content
of the bbndk-env.sh/bat script file to resolve environment for BB10 tools.

The content of the script file is not documented and is a subject
of heavy and frequent changes.

Now QnxUtils::qnxEnvironmentFromNdkFile() function executes the script file
and dumps the important env. variables that are parsed standard way.

Change-Id: Ie7636054d62ec62b32cd3ab3d93a59b7d6c0882a
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-11-05 10:18:15 +01:00
Leena Miettinen
cd37acf69e Doc: move Qt Designer info to Qt Designer topic
This information looks a bit out of place on the
landing page where we make a distinction between
Qt Designer and Qt Qt Quick Designer.

Change-Id: Ie8b7cb678c1ecc293f74bc43252536b550649b88
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-11-05 08:55:46 +01:00
Tobias Nätterlund
e02b492a4e QNX: Remove dead code
Change-Id: I004a07c1b047c1ff6a390e5432f97a299781568d
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-11-05 07:06:25 +01:00
Aurindam Jana
1a37da73ab Revert "QmlProfiler: Rename Label to CategoryLabel"
This patch should go to 3.0
This reverts commit aa624b9defb205acf10b535f7bbb187e5a52785c

Change-Id: I5efed4110275d25b5bf21d8894de441e5f715dbe
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-11-04 23:08:46 +01:00
Aurindam Jana
e96e84b6c3 QmlProfiler: Rename Label to CategoryLabel
This is to avoid confusion with generic Label
Quick component.

Change-Id: I6a72266c394862706215b6db40bcd3592f9d24b3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-04 23:04:46 +01:00
Fawzi Mohamed
f42a739291 qmakestep: remove spurious comment
Change-Id: I55ee4b24ccb3789b2bbd75e0bb9a2176cbb8522e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-04 19:56:50 +01:00
Friedemann Kleint
06eaed8a7a iOS: Add Linguist comment.
Change-Id: I4eac32fdda32cb5d6a4d8676b25884d5a9e205ea
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-04 19:37:46 +01:00
Friedemann Kleint
fc1a209fe0 iOS: Unify translation of iOS-Device.
Change-Id: I01374545ec3882a1dc9b08adccf4632f38438efb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-04 19:37:12 +01:00
Fawzi Mohamed
e8a4e9c230 ios/iosplugin: cleanup imports and unused code
Change-Id: Ib8e446f71b1b8196f25dd0dc3838f15f27f54bd4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-04 18:45:37 +01:00
Tobias Hunger
0a62401867 GccToolChain: Update ABIs on Mac
Change-Id: Ic55389ee8200e3f78f8bb0752411b0a0ae5d5e62
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-04 18:44:05 +01:00
Eike Ziller
295d01b0f5 LLDB: update display options once directly after run
The display options like "Use debugging helpers", "Dereference Pointers"
etc are already updated the moment they change while the debugger is
running, but it was missing the initialization at startup.

Change-Id: Id39a38c6646c3c19819e2c122d7f8be285eae09e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-04 18:20:20 +01:00
Fawzi Mohamed
58b98b039c iossim: bring simulator to front
Change-Id: Ia52237760d36f342d6b053525ca6617a1e722aab
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2013-11-04 17:51:03 +01:00
Eike Ziller
d06fb9cf47 LLDB: remove unused method and variable
Change-Id: I4195ad4bf5af3e912f49411acb4bc3a6ec4df33b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-04 17:50:29 +01:00
Eike Ziller
8c6fb68972 dumpers: fix QUrl for Qt4
Change-Id: Ib93bdcd86532fe9313889b70db655a26e1ca7c71
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-04 17:47:15 +01:00
Daniel Teske
623fc1e902 QmakeProject: Fix crash
There's no target if the project is in the parsing without configuration
state.

Change-Id: Id21e2ded5b634253267e956accc27715e6562941
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-04 17:03:05 +01:00
Daniel Teske
81912724a2 TargetsetupPage: Fix crash
The case looks like this:
Two kits on the targetsetuppage.
- Already existing kit, selected
- Temporary kit not selected

Switch reset() and setupProject() to the order they had before
the TargetSetupPage generalization.

Task-number: QTCREATORBUG-10417

Change-Id: I51cfb1e01193c57e06aebeaa8defa11809e24c50
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-04 16:52:43 +01:00
Daniel Teske
3164faa4a4 ClangToolChain: Allow clang-macx-32 mkspec
Task-number: QTCREATORBUG-10599
Change-Id: I091db84c81b0ad031744142568cc37d648e9dfb7
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-04 16:50:30 +01:00
Leena Miettinen
8fe008fbe0 Doc: update info on Qt Versions in Build & Run options
Update screenshot and add a new one.

Change-Id: I6e2845bbc31474e32c307982fd380a42722d5367
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-04 16:50:03 +01:00
Tobias Hunger
5dc857fcae AbiWidget: Use blockSignals properly
Change-Id: Idd0e0a4486d6d94194d3a144fc238b93128ecf6b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-04 16:38:13 +01:00
Tobias Hunger
aaa287cc4d GccToolChain: Improve detection of 64bit/32bit
No longer use the undocumented __X86_64 macro to decide on the
word width of a tool chain target. Use __SIZEOF_SIZE_T__ instead.
That is documented to be set and should also be applicable outside
of the intel x86 world.

Some versions of mingw do not define __X86_64 on 64bit intel
machines and thus are not properly detected.

Update unit tests that try to guess the ABI to use the new macro
instead and fix the fallout.

Side effect: Some abis are detected in a different sequence now.
That should not change the tool chains though as the ABI that is actually
used is stored extra and does not referrence that list.

Task-number: QTCREATORBUG-10584
Change-Id: Ia9e5909cdff3b057ef74b24c0f2d654a14253c21
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-04 16:37:40 +01:00
Tobias Nätterlund
d005efd524 QNX: Fix debugging on QNX >6.5
The previous approach when debugging on pure QNX 6.5
no longer works with QNX version >6.5. Use proper way with
"set nto-executable" and "run" instead.

Change-Id: I00961236b416c42a0c81e29ea087de5ddd3a5f00
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-04 16:35:48 +01:00
Kai Koehne
fe1cf36e1f Remove support for debugging JS with Qt 4.7
Remove infrastructure to debug/inspect QML applications with Qt 4.7.

Change-Id: I277e9884e009475a29017f502bbe1d069317460f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-04 16:32:33 +01:00
Eike Ziller
9b3ab11f89 Fix registering shortcut for text editor actions
Broke with f1eb9c4827 which exchanged
setDefaultKeySequence with setKeySequence

Task-number: QTCREATORBUG-10538
Change-Id: Id40bd8fd403cd586a39a19c248f59e23cf4cf8c0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-11-04 16:03:36 +01:00
Friedemann Kleint
1b370a4e77 ProjectExplorer: Fix message placeholders.
Change-Id: I81d2334371aa393348e889f361ac2b4c7995df3f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-04 15:41:58 +01:00
Tobias Hunger
1ef50b3cac GccToolChain: Remove useless member of config widget
Change-Id: Ie62f5aa5fc400cec47eba29ee59449c8a8b3ba53
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-04 15:27:39 +01:00
Mitch Curtis
b0b7571654 Fix typo in New Project dialog for Qt Quick UI apps.
Change-Id: I54287e4d6e6d6e6f9dc7575201b8034b365d1c01
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-04 15:12:34 +01:00
Tobias Hunger
bb06ff83d7 LocalRunConfiguration: Do not add a LocalEnvironmentAspect
This makes the specializations responsible to register the environment aspect
that makes the most sense for them.

The only real user of this is the QmlProject, which added its own
EnvironmentAspect on top of LocalEnvironmentAspect set by the base
class.

Change-Id: I2ad8c23a008e249dc919491a5fd397ec04502375
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-04 14:50:47 +01:00
Oswald Buddenhagen
c759e39c1d validate TOC references
Change-Id: I09ff290bc7da85ca2087a485b67f717e55bd6666
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-11-04 14:48:46 +01:00
Oswald Buddenhagen
46408bd872 save double hash lookup
Change-Id: I9a0c5b51955e137f85bd505d2cc35a69b2d2fd91
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-11-04 14:48:43 +01:00
Tobias Hunger
92008f4b6a Project Mode: Show run settings for projects without build settings
Open the "Run" view by default when switching targets in projects
without build settings. The build settings view is not what the user
wants in that case.

Change-Id: I14b5d32fa3fdfef1ba7d4f9f6af383d28021baa8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-04 14:48:40 +01:00
Oswald Buddenhagen
763adac30a don't let unrelated lists in the front page confuse us
instead, look for a section named "Table Of Contents".

Task-number: QTCREATORBUG-10585
Change-Id: Ieca51b40387749243a633369119a7d9473ee2325
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-04 14:48:25 +01:00
Leena Miettinen
3bbda25d3d Doc: new Compiler options in Build & Run options
Describe the new platform codegen and linker flags options
and the custom parser settings.

Update and add screenshots.

Change-Id: I64498258930ce1f912bcd8891a6b55f40d903f2c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-11-04 14:39:36 +01:00
Leena Miettinen
2bd9fb4568 Doc: add link to field descriptions from Editor settings topic
Add link to "Viewing Function Tooltips".

Update screenshot, because the tooltip fields were moved around.

Change-Id: Ic5e8d3d8c9a859c6a6748d631640b42239ea6f3f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-11-04 14:17:38 +01:00
jkobus
a287352109 Remove unused code.
Change-Id: I12007e9d198cd264d461b22abf3851052db62cf0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-04 14:11:11 +01:00
Thomas Hartmann
12bdfdb744 QmlDesigner.ImportManager: Adding setReadOnly to ImportLabel
Using disabled did not give any visible feedback.

Change-Id: I67bb9cd83c7d36c5899e40a91e9a6a34cb882ec4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-04 13:44:51 +01:00
Thomas Hartmann
964815614d QmlDesigner.PropertyEditor: code style fix
Change-Id: Idadf59d90d64abf908fc7cfa58fc217f6c335c6f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-04 13:43:47 +01:00
Thomas Hartmann
f3df04efe4 QmlDesigner.PropertyEditor: Adding proper FontComboBox
Change-Id: I6199e6454f02442ab3cd8962a262ae3a4f0e3b48
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-04 13:43:38 +01:00
Thomas Hartmann
b0bae3ec29 QmlDesigner.ImportManager: adding tooltip to ImportLabel remove button
Change-Id: I5b057b393531e80f7be0f86676c98b396532d8aa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-04 13:43:28 +01:00
Thomas Hartmann
64254140fb QmlDesigner.ImportManager: Adding tooltip to ComboBox
Change-Id: I5c631b8b8199d9a0713b82ec40c97e498dd06d1e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-04 13:43:13 +01:00
Thomas Hartmann
da1af01287 QmlDesigner.ImportManager: Adding all QtQuick imports as used
Change-Id: I0b3cb3c37065cc78efbdc1a4af0f762afc8097c4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-04 13:43:05 +01:00
David Schulz
ddcb258559 ProjectManager: Update deploy step on project load.
Change-Id: Ib1247e1389284f793d4803871cfcd174aca5facd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-04 13:20:39 +01:00
Leena Miettinen
df8633478c Doc: attempt to explain what sessions are
We constantly get feedback that clearly shows that
users do not understand how sessions work.
Updated screenshots.

Change-Id: Ifcf3b08ca2f27e14085a5d84adaeacddc59588d8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-04 13:14:08 +01:00
Robert Loehning
147e01eb9f Squish: Update tst_session_handling
Change-Id: Iac27111fe5cf41acfc78dd5534583f7a27712c3a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-11-04 13:09:46 +01:00
Fawzi Mohamed
345eb5b0a5 lldb/ios: add platform specification
Change-Id: Ie7867dce5bd50573d714d41bf46195a802eb61c7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-04 12:50:11 +01:00
hjk
262e3ab9db Debugger: Record version of GCC in tests
Change-Id: Id86c313d2a5238c0e301c3b23bde7fabe00efdda
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-04 12:44:25 +01:00
Fawzi Mohamed
e461567500 ios: improve kit and toolchains autodetection
* simplify probe
* adapt to Xcode 5.0.1 (32->64 bits)
* force correct abi for iphonesimulator (autodetection fails)

Change-Id: Ib489d621858fd1b026222f067245a0480ea8fa03
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-04 12:39:44 +01:00