feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,594 Commits 108 Branches 368 Tags
660344536df72a4b571a4592a7002a26e07e2adc
Commit Graph

31594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Stenger
8ff61e3036 Squish: Enable Qt5 for suite_qtquick test cases 
Change-Id: I84caf3b4c47badcf444242b6fbc52090ccb5680a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-30 14:37:54 +02:00
Christian Stenger
1cecc5b0f7 Squish: Make sure current documentation is loaded 
Change-Id: I6d45ce482de3f61a14953bbb7714b1293aa2459b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-30 14:37:36 +02:00
jkobus
86f9a2b7e6 Fix generic highlighter autotest 
Change-Id: I35994a8c29374edfeb8a230af10c2a3277232f22
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-08-30 14:19:37 +02:00
hjk
513b884dfc Debugger: Silence warning on empty debugger settings in legitim cases 
Change-Id: Ibaa830f615a3d739a198a9550cd955dc9151c009
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-08-30 14:13:05 +02:00
Orgad Shaneh
841aa19853 QmlDesigner: Plug a memory leak 
Change-Id: I608b254b06db923c0ad718a15c4d697ba580c006
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-08-30 14:05:32 +02:00
Tobias Hunger
05dbc26cc3 Core: Small cleanups 
Change-Id: Id85ef2e53f42fd934716d07e1bfc7ec14a59f878
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-30 13:31:55 +02:00
hjk
71affce4e4 ModeManager: Force use of static interface 
Change-Id: I314ca347fd0fad30bf5ac6a6d4c67db8e5687065
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 13:30:29 +02:00
Tobias Hunger
fc16156ff1 TaskHub: Make instance() return a QObject* 
Change-Id: I508cd2df7ad8de02c8e46fe65e6905d1a41b2bb9
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-30 13:17:44 +02:00
Tobias Hunger
50945b0a18 PluginManager: Small docs update 
Change-Id: I0d0e021a272f818746d2482a5ba0c536bf125539
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-30 12:46:00 +02:00
hjk
f33a9813b1 Debugger: Fix configuration upgrade path from 2.8 
Change-Id: I67547dfad529ebb918741721b691c39bb0e69720
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 12:44:33 +02:00
hjk
99f22de6ba TaskHub: Add convenience function to add a task and clean up users 
Change-Id: I5c76f8af720092d4e47b1a9fa889fb3a7010f21f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 12:44:10 +02:00
Orgad Shaneh
fc6ff05472 VCS: Update progress bar for commands that output progress 
Change-Id: I643df94c72068259817092d7d48f71984288fdb5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 12:19:25 +02:00
Daniel Teske
6c582e0180 Android Manifest Editor: Show available targets in combobox 
Task-number: QTCREATORBUG-9682
Change-Id: I0454d96ff0a1df370e0b9197ae536bf5ae632ac2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-08-30 12:05:04 +02:00
hjk
87a0f018ed QmlProfiler: Simplify QmlProfilerClientManagerPrivate 
Change-Id: Ib43417ef11ba9d052869e5088dd4c0cc551261c6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:36:45 +02:00
hjk
d66369e21d Core/Help: Clean up HelpManager interface and users 
Change-Id: Ia6edf583f2a002d7c6f4878df670a78614ea087d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:34:39 +02:00
hjk
975e1be2ab Compile fix 
Change-Id: I522fa14be958284fb8ed3ff4626a31b8ee575546
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-30 11:29:48 +02:00
hjk
68537ef0f3 Core: Force use of static DocumentManager interface 
Change-Id: Ieb2c0ecd3d34a3aad653c6eb5b00bc20d2c61986
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:27:55 +02:00
hjk
e520c38f41 Core: Remove deprecated accessors 
Also adjust user code.

Change-Id: I60935942a7012e6a0d6091ffbc89d69289366e35
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:25:59 +02:00
hjk
eb724f3772 EditorManager: Use interface directly instead of going through ICore 
In the majority of cases we were doing that anyways, having two
ways is just needlessly confusing.

Change-Id: Ied362a702c23beee528368d74df1f2aabe5807f8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:25:51 +02:00
hjk
4a24df38a3 EditorManager: Use static pattern, adjust surrounding code 
Change-Id: I3255a0150cd9a730336456c5a9f986eb74fefbff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:22:56 +02:00
hjk
e1823072a1 CorePlugin: Use static VariableManager functions where appropriate 
Change-Id: Ie3d34a829522e15b2a56c0fcc696e60163a9be32
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:22:47 +02:00
jkobus
24ccd50015 Add a toolbutton for switching diff view mode 
Task-number: QTCREATORBUG-10035

Change-Id: I83cb7cec3f4ba484ab068f398a12096501017668
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:21:31 +02:00
hjk
8749eee578 PluginManager: Clean up interface a bit 
Change-Id: I6ce4443115c359c2c9588ffa615d13c29c249df2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:18:22 +02:00
hjk
0ed9b97a1f QtVersionManager et al: Code cosmetics 
Apply static 'pattern' for QtVersionManager, de-noise using code.

Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 10:54:16 +02:00
Christian Kandeler
32d98862e7 Debugger: Fix argument placeholder in string. 
Change-Id: Ie22bc9f4b4b26099d2b9af07379629b2ec31c469
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-30 10:49:18 +02:00
Orgad Shaneh
47b01acd32 Git: Some cleanup for branches on show 
* Suppress command logging
* If no branches are found, do not add "Branches:" line

Change-Id: Id32b5f429a5c0324ec9e6d9d016f47160e9e5012
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 10:42:38 +02:00
Orgad Shaneh
35fce3c2ad Move VCS topic next to file name 
If no file is open, show it next to session/project name

New format is:
* foo.cpp [master] - session - Qt Creator
* session [master] - Qt Creator

Change-Id: I9945396ffadbffa8fca4b397dda33cfa54131997
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 10:42:24 +02:00
Orgad Shaneh
860584c17d QbsPM: Use environment QBS_{SOURCE|BUILD}_DIR in qmake project 
Change-Id: I05bf910682effe3ef6e468a891f8e9e96f5827bd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 10:39:38 +02:00
David Schulz
78a75b8e89 CPPEditor: Remove unneeded code. 
Change-Id: I7f0263e461f5d03cd7ccde47ebbeaabad8d11c6d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-08-30 10:34:25 +02:00
Orgad Shaneh
f2e4b2b9c8 VCS: Invert Command -> runVcs dependency 
* Unclutter runVcs
* Enable more dynamic signal/slot usage in Command

Change-Id: Ie97b17078778b0c86b74d5725a78e766828ac6d8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 10:11:56 +02:00
hjk
80194f4ef4 Debugger: Fix compilation with Qt versions < 5.2 
Looks like not everyone updated yet...

Change-Id: Id0abe512ba22738953ead288edd84b3778fc170d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-08-29 18:27:58 +02:00
Christian Kandeler
bd6c1c4f55 Fix qbs build. 
Change-Id: I79d6be0211ae1da543140db397a9ebe4e6cab6b5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-08-29 17:55:56 +02:00
Paul Olav Tvete
db78293e7f Generic Android error messages 
We want to give better feedback for installation problems and
other issues. There may still be undiscovered ways to mess up the
creator configuration, and we might find them after the string
freeze.

This adds a number of strings that we can use later.
We can add new error codes after the string freeze (and even in
patch releases). This means that even if we can't give people
detailed help for their problem in the UI, at least we give them
a googleable string.

We can then add better messages for the new errors in the next minor
release.

Change-Id: Ida7921fce5142d55144b0ba022de04726872187a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-08-29 17:07:32 +02:00
hjk
e4b2947c6f ProjectExplorer et al: Code cosmetics 
Apply static 'pattern' for ToolChainManager, de-noise using code.

Change-Id: I196dc6f39dc2c61b1783aecad3faa0b23849e00a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-29 16:45:25 +02:00
hjk
c10ae974eb KitInformation: Make dataId and priority value members 
More in line with recent development.

Change-Id: I38ad7dd0cb96080a9dc9cc3165e4fb7c78a736b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-29 16:26:02 +02:00
hjk
36227d5c3a ProjectExplorer: Introduce per-kit debugger configuration page 
Change-Id: I65c76f3ff43e1479075926c7e3fa460cca74d8fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-29 16:12:08 +02:00
Friedemann Kleint
c90df2b35b Reduce usage of QStringRef::toString() in settings reader. 
Change-Id: Ie66432caa250eb3122739b38b5b0a02c66942cc3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-29 16:01:49 +02:00
Christian Stenger
2a2ecdc323 Squish: Prepare enabling Qt5 for suite_qtquick 
Change-Id: I7c4ac62be8f30867953f776ad56ab3ffbf6cd909
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:11:01 +02:00
Christian Stenger
2665eced9b Squish: Move common function to shared script 
Change-Id: I59d341f9f7a5c86bc3b723dbdc1e1596d464c92c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:45 +02:00
Christian Stenger
cdf8407d67 Squish: Fix determination of available targets 
Change-Id: Iff01b44058dd9175aacfb0a0da96f35fb32383e7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:32 +02:00
Christian Stenger
4fc9302c56 Squish: Move common code to shared file 
Change-Id: I5e268d6faf9a2a5a779e850667c582328c42387d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:14 +02:00
Christian Stenger
4c0778786b Squish: Build Qml debug lib only if necessary 
Change-Id: I90cf1f9e57d39211ea151b1cfc52e27f4ecaf654
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:09:58 +02:00
Thomas Hartmann
c4babe8c43 QmlDesigner: crash fix 
The assert is wrong. We check the currentModel from QmlDesignerPlugin::hideDesigner()
and it can be null in case of a .ui/.qbs file.

Change-Id: Ifffa168f81bade757cc8d800150e4411c09915e7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-08-29 14:34:56 +02:00
Christian Stenger
5bcce3d131 Compile fix 
Change-Id: I081f816a14d2a823dac87ba064be2b2c00ecd319
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-08-29 14:20:50 +02:00
Friedemann Kleint
4d11977bb7 Reduce usage of QStringRef::toString() in the QML profiler. 
Change-Id: Id246bea7c21c61c87d02e3a839b44617e24d58fc
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-29 13:45:34 +02:00
Friedemann Kleint
e81f0e25de Reduce usage of QStringRef::toString() in cppcodeformatter.cpp. 
Change-Id: Iff4634c3bd3829d236e3dd38e4d29ced5f118db6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-08-29 13:07:37 +02:00
Thomas Hartmann
59c49d5336 QmlDesigner: adding check for null pointer 
Better save then sorry.

Change-Id: Ica022c37be8beab0d99a9c1aaf2d5fa15d7141e6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-08-29 12:52:47 +02:00
Friedemann Kleint
bf5e8dc0e7 Reduce usage of QStringRef::toString() in the core plugin. 
Change-Id: Ic3e2c16f5345012b8c6654929deb74f753e3ec8f
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-29 12:27:24 +02:00
Friedemann Kleint
84cfc4f914 Reduce usage of QStringRef::toString() in project manager/cmake. 
Change-Id: I5d60c663d8a258334dde9b93b4f76a4bea760a70
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-08-29 11:49:50 +02:00
Friedemann Kleint
e43e466b5b Reduce usage of QStringRef::toString() in QmlJS/QmlJSTools. 
Change-Id: I9db2a0b21bf430d6f450e1e860a0c2a02272536f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-08-29 11:35:41 +02:00