Daniel Teske
589945b7d3
ResourceNodes: Add copy to clipboard actions.
...
One for :/prefix/file paths and one as a url qrc:///prefix/file
Task-number: QTCREATORBUG-11776
Change-Id: I98cc2fccf98a6bf07487352e9b10ae29e8347a45
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2014-03-31 15:47:43 +02: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
Daniel Teske
50fc169c94
ProjectTree: Change hasBuildTargets to FolderNode::showInSimpleTree
...
So that the resource node can override it.
Task-number: QTCREATORBUG-11678
Change-Id: Id30d1b99ee23cc18fc29fc99cf0ad7ca919ed527
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-03-18 14:23:11 +01:00
Daniel Teske
8a8afe42b1
ResourceNode: Remove unnecessary update() call
...
Change-Id: Iea72f2cb02b6b983cb90d4dd09c5e0fc1f8c0c3f
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-03-14 13:07:26 +01:00
Daniel Teske
911f6b5159
ResourceNode: Fix renaming prefix
...
Task-number: QTCREATORBUG-11719
Change-Id: Ib24dd7bf644bbebca3d9a694ec2b98709cfd6cf2
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2014-03-13 15:45:45 +01:00
Friedemann Kleint
fe184c4504
Fix warning about truncation from int to bool in resource editor.
...
Change-Id: Id7ea03b27e9fd36e5f452736e81992089dfc73b5
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-03-13 13:20:27 +01:00
Oswald Buddenhagen
52bf71fbdf
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
README
tests/auto/debugger/tst_dumpers.cpp
Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
2014-03-11 13:39:55 +01:00
Daniel Teske
ca6efdcedc
ProjectExplorer::New File Use addNewInformation also for context menu
...
So that the resourcenode can steal from it's parent
Change-Id: I97a21d94c0ddb0d217c48fd69dc808446763837b
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-03-10 10:45:11 +01:00
Eike Ziller
5dd8d7cd9c
Editors: Move id() from editor to document.
...
Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-03-05 16:27:52 +01:00
Orgad Shaneh
919cad1fa7
ResourceEditor: Remove unused static function
...
Change-Id: Idbf32158993f9f77c4f18e142a46b0e2ca132831
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-02-20 12:18:22 +01:00
Orgad Shaneh
3906a6af1b
Fix qbs build
...
Change-Id: Ia46ac9dfa010e623d71e77c50f84517db71338ec
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com >
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-02-20 12:18:19 +01:00
Daniel Teske
9310b652eb
Resource file in project tree
...
Task-number: QTCREATORBUG-1346
Change-Id: I0cbb5633ef06a4762c48af46d9da551c67259d70
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-02-19 17:44:09 +01:00
