Commit Graph

38241 Commits

Author SHA1 Message Date
Thomas Hartmann
c20c20f012 QmlDesigner: Activate anchor target selection
Change-Id: I5aada9ffa67177b13ec7cf7f3c819f2f0530a822
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-13 18:43:00 +02:00
Alessandro Portale
ee9ba6a32e WelcomeScreen: Adding @2x variants for the icons
Change-Id: I50ecb0ff07c84033eaede6fd8a5dbcdc2ae5230d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-13 17:05:51 +02:00
Eike Ziller
ee9d433ca6 Fix that opening qmake projects could result in delayed first parsing
Do not set the timer interval while the timer is running.

Change-Id: If72eb77fed88a5dda3f6356b1bd82aab781b160d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-13 16:49:52 +02:00
Christian Stenger
135a0dfb0e Squish: Fix Welcome page related tests
Change-Id: Ifbec46c6e695835f9d88d298823e8793ed428409
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-10-13 14:15:24 +02:00
Christian Stenger
42236fc734 Squish: Fix some tests due to latest refactorings in QC
Refactoring of dialog wizards and editors.

Change-Id: I6604a302b04579519c78698375bc4b1027ac8b02
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-10-13 14:15:12 +02:00
Finn Brudal
8fe9df2697 ProjectExplorer: Fix invisible Run submenu
The Run submenu on the Project context menu was never shown.

Change-Id: I4fd29e3b7974114f094d995ef5d31f8bdbc25596
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-13 12:26:22 +02:00
hjk
df3d22ef1c Utils: Move MacroExpander to file pair of its own
Change-Id: I777accd58dafca39a0d3e50541af325277c49c6b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-13 11:51:03 +02:00
Eike Ziller
b3f3c96bca Help: Fix "Open Link" context menu item in search pane.
It selected all text in the search result widget, instead of opening the
link.

Change-Id: I264a8cc7ab29e71519d6d10b75a21fcd940d459d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:24:03 +02:00
Eike Ziller
9e74d06402 Help Window: Add contents view to side bar
Change-Id: Id690c71471ed9a61bd7a926db70e1b1fb9fac8ab
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:23:52 +02:00
Eike Ziller
2735ff4068 Help: Make it possible to create multiple content views
Change-Id: I77ccbd1b48e9611f263716a248a6193dcbad8823
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:23:29 +02:00
Eike Ziller
5cf2972345 Help: Clean up bookmarks widget
Remove unused buttons, and unify style with other views (e.g. no focus
rect on OS X) by using the common navigation tree view class.

Change-Id: I51ce1806507e45077bcbf6b8589585bb15eae712
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:21:50 +02:00
Eike Ziller
46dfd21ce5 Help Window: Add Bookmarks view
Change-Id: I8b4db5b3208c4133466fe4e61f1dd1f18b432fea
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:18:14 +02:00
Eike Ziller
85a6ea6c98 (Help)SideBar fixes
1. Get rid of the need to remember the side bar items, instead use the
IDs for activation.
2. Fix issue with empty side bar that cannot be shown, if settings exist
but contain invalid item IDs.
3. Use actual IDs instead of translated window titles for item IDs. This
requires using a different settings group to avoid issues with 2. when
going back to earlier versions of Qt Creator.

Change-Id: I1a760aa5a019db3231803af1bb72f83db49ba6b0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:17:52 +02:00
Eike Ziller
3c59cdd031 Add index and filter combo box to external help window
Change-Id: Icc815379220c55d9d7dc5d154278ba21ce2e9984
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:17:13 +02:00
Eike Ziller
286dd71a5d Navigation side bar: It is "View", not "Pane"
Change-Id: Ic6a2f953089a58a8aaa432b9edeb7f6357d527f6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-10-13 11:16:37 +02:00
Alessandro Portale
9d58d44941 WelcomeScreen: Improve hovering of recent project items
No gaps inbetween the items. The whole area is click-sensitive.

Change-Id: I269e657ef8940387d9844baf17741c1cb3a50dd9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-13 10:49:48 +02:00
hjk
cd90ddad55 TextEditor: Move some enums to namespace scope
In preparation for the final s/BaseTextEditor/TextEditor.

Change-Id: Ie18db9817ec9eec53d805443605ca55423c64c93
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-13 09:31:43 +02:00
hjk
392b3f65d2 Debugger: Speed up reading of 0 terminated blobs in dumpers
Change-Id: Iebc64c21f4dd6f4876989e57d3a347b96e1bd449
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-13 09:22:23 +02:00
Orgad Shaneh
86ca234004 ManhattanStyle: Reduce scope of local variable
Change-Id: Id9dcb4706934ee36972a55c73c23f046357c9512
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-12 05:04:39 +02:00
hjk
91f11d4b47 Debugger: Add an macro expander for debugger engine type
Change-Id: Ib16f3b410ea83f6a4687b03677c51fbec26165d7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-10 20:42:45 +02:00
hjk
0f29d404fd Kit: Denoise kit.cpp
Mostly namespaces.

Change-Id: Ib11a75207d20e4db1233542e7e021dab647d70a6
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-10 19:14:59 +02:00
Thomas Hartmann
47e3c79b88 QmlDesigner: Updating WindowSpecifics
Change-Id: Ic4bead3e100d00cf532fa10cda42270eb642bb26
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-10 17:00:37 +02:00
Daniel Teske
cb068421b9 QmakeProject: Make initial parse use the async parsing
Task-number: QTCREATORBUG-12123
Change-Id: I79dcd684fe826108189db521c392c0f1d7632f88
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:30:50 +02:00
Daniel Teske
742e14f1e9 ~QmakeProFileNode: Simplify code
Change-Id: I6d56b8637b4194b57c4c0df033d0bc7919e24aeb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:30:43 +02:00
Daniel Teske
679d4e3582 QmakeProject parsing: Move code from gui thread to parser threads
Change-Id: I05c1ec01a2c1ae4017ad2d09b07aa87854e3f118
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:30:33 +02:00
hjk
c61804679f QtSupport: Use the new MacroExpander base
Change-Id: I8a3f3d461179ab1abf1704166ad3861645d49f99
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:23:04 +02:00
hjk
46c4ab7bf9 Utils: Introduce a not-so-abstract MacroExpander utility class
The current use of AbstractMacroExpander requires some boiler plate
code that can be avoided.

Change-Id: I753d872d824274d94d5105232a8fc05ac7bf0711
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:22:52 +02:00
Thomas Hartmann
0812718905 Adding new wizards for QtQuick supporting Qt 5.4.
Change-Id: I2af1cff65032bb583864c1c8ee3a3636a46e3c39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-10-10 16:09:03 +02:00
hjk
326d057d32 FancyMainWindow: Fix method naming
... and resulting logic error.

Change-Id: Id1d437c6ad3e9531387859b7d449d4b47f86f0e3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-10 13:37:24 +02:00
hjk
1baca8e797 Debugger: Add dumper for Qt3's (sic!) QString
Change-Id: I24d266587425a5c50ec3dcb548a29877730cbdff
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-10 13:25:02 +02:00
Daniel Teske
fa8d52cd23 Profile parsing: Extract VPATH information for the .pro file
And reuse that for all .pri files. This is a lot faster.

Change-Id: Iff81a50b892ad666ed6c899aa242b6e9b394f339
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 11:49:45 +02:00
hjk
0691bf93b0 Debugger: Remove unused dumper code
Change-Id: Idc2d17e34bf5666c56d6f54b657867f1b0ecf943
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-10 11:37:28 +02:00
Thomas Hartmann
20b118782c Adding new QtQuick features for Qt 5.4
Change-Id: I2b23d08c9d9602b1001c96901a57cf8abfb2e9dd
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-10 11:27:29 +02:00
Tim Jenssen
605e869335 QmlDesigner: fix regression from last filter import fix
- adding line ending to the import code
 - set correct fileUrl to resolve local directory imports

Task-number: QTCREATORBUG-12625
Change-Id: I2861fc5674ff0fa4f6cc9e308a22cd2853ffa85c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-10 11:16:12 +02:00
Eike Ziller
9cc88836f7 Help: Make it possible to create multiple index views
This unfortunately means doing the filtering by hand,
because filtering on the QHelpIndexModel would be shared
between multiple views.

Change-Id: Iae38952a92dbb1b4a9685aea6f057d96f0d0784f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-10-10 10:14:38 +02:00
hjk
a10f207756 Partially revert "GenericProject: Use some Qt 5 connect"
The QSignalSpy parts are 5.4 only, but we need to run with 5.3

Change-Id: I77f778cd66af2f2182d067ca16d2aceeacb9ab3f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-09 23:26:34 +02:00
Tim Jenssen
ab21b7b67a QmlDesigner: move setObjectOwnership
- to the same position like in the other methods

Change-Id: Ie12147de0e9030a35928a2c0a5dd38d34f998845
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:10:49 +02:00
Tim Jenssen
fd6afba3c3 QmlDesigner: improve error output of the puppets
- errors -> warning none false outputs -> debug
 - adding some more error outputs

Change-Id: Ice61d10a87dc5ef789b7913cae166641b18ddf27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-09 18:10:43 +02:00
Tim Jenssen
808094e9e1 QmlDesigner: avoid setContext warning if there is already one
Change-Id: I2d23f8f18cce11bdfbdcb4a8d9d6d99fec7d20e6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:09:37 +02:00
Tim Jenssen
dce26fc29d QmlDesigner: use engine argument like all similar methods
Change-Id: I1238cbd60e38ade3f54937ca8f901517c543a3ad
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:08:44 +02:00
Tim Jenssen
0ecc1114bd QmlDesigner: remove unnecessary spaces/lines
Change-Id: I867ab5afc82e67644b7004e97886b46250f5d3df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:08:09 +02:00
Tim Jenssen
80bc7f79bc QmlDesigner: remove commented connect
The connected SLOT is even not existing any more.

Change-Id: Iea352ca4929146c20b897e1a8fbb00a601364068
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:07:29 +02:00
hjk
c17b540fd4 Re-introduce option to toggle FancyMainWindow auto-hiding
This reverts commit 1541fbd2ba
in parts. The title bars can now always be shown (the same
state as the old "Unlocked" state) or not always be shown
(the previously "new" behavior).

The default is now "Always shown". Hopefully that makes hiding
the titlebars a conscious (usually one-time) activity
that's not forgotten.

Change-Id: Id31fb193b2eb6376000c845d4a61194e2ed33129
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-10-09 17:17:40 +02:00
hjk
ab34b23e10 Make SessionManager::instance() return a SessionManager* again
That's easier to use with Qt5-style connects.

Change-Id: If6afac0718502edc1df6bf0cec1db1466116bbb8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-09 16:52:32 +02:00
Daniel Teske
4012b7590d Fix handling of current node if project tree view is hidden
I'm not 100% sure that this fixes the crash from QTCREATORBUG-12876.
But it's clearly wrong to only check for removed nodes in the project
tree widget and thus only if a tree widget is shown.

Task-number: QTCREATORBUG-12876
Change-Id: Iaaafcef0fe408e8bc2f4d2b61133f4419a612d57
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-09 16:20:59 +02:00
Daniel Teske
0047718205 CMakeProject: Add option to override the make command
Task-number: QTCREATORBUG-11788
Change-Id: If6a908ced927051b8ae131f4876c24a04b0ccaf7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-09 16:20:13 +02:00
Daniel Teske
c0b3dd7afe ProjectMacroExpander: Actually make it work
Fixes 7 of 9 variables which didn't work due to kit always being null.

Change-Id: I47fbb9ba8aea4736c137939b7ec1d685f94d3fca
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-09 16:20:07 +02:00
Daniel Teske
7255b71422 BuildConfiguration: Use ProjectMacroExpander
So that in the context of the buildconfiguration and its buildsteps
current project and others refers to the project of the bc.

Task-number: QTCREATORBUG-12869
Change-Id: Idad7741301432a5fddffdff4225762f4100a3dee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-09 16:19:49 +02:00
Eike Ziller
be65afa958 Help: Save side bar visibility without keeping track manually
Change-Id: I95982455a996cdec3a68f3db5cf714a609207814
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-10-09 16:04:00 +02:00
hjk
5530e2de66 GenericProject: Use some Qt 5 connect
Change-Id: I990aa7a6f59fa323d2d8e3c90bf89b18f6fc2058
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-09 16:01:30 +02:00