Oswald Buddenhagen
dc3c156cac
Merge branch '2.2'
...
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
70d392d235
core: make context and widget IContext data members
2011-04-14 11:15:07 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
dt
fd94a9c1a1
Make the TaskWindow scroll per pixel
...
Task-Nr: QTCREATORBUG-3562
2011-01-24 17:30:30 +01:00
con
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
b1bcf081d8
Merge branch '2.1'
...
Conflicts:
src/plugins/coreplugin/basemode.cpp
src/plugins/coreplugin/basemode.h
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
src/plugins/debugger/debuggeragents.cpp
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/debugger/debuggeruiswitcher.h
src/plugins/projectexplorer/buildconfigdialog.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
src/plugins/qmldesigner/designercore/include/modelutilities.h
src/plugins/qmldesigner/designercore/include/nodeinstance.h
src/plugins/qmldesigner/designercore/include/propertymetainfo.h
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
src/plugins/qmldesigner/designercore/model/modelutilities.cpp
src/plugins/snippets/inputwidget.cpp
src/plugins/snippets/snippetscompletion.cpp
src/plugins/snippets/snippetscompletion.h
src/plugins/snippets/snippetspec.cpp
src/plugins/snippets/snippetsplugin.cpp
src/plugins/snippets/snippetswindow.cpp
src/plugins/snippets/snippetswindow.h
src/plugins/texteditor/snippetsparser.cpp
src/tools/qml/qmldom/main.cpp
tests/manual/trk/runner.cpp
tests/manual/trk/trkolddevice.cpp
tests/manual/trk/trkolddevice.h
tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049
License headers.
2010-12-17 16:03:42 +01:00
Tobias Hunger
cda261db58
TaskWindow: Improve delegate
...
Improve the delegate used to paint the tasks inside the taskwindow.
* Limit maximum size of the area used to paint the filename.
* Fix glitch where the filename is painted over the line number
* Reduce size of gradients painted, use clipping instead.
Task-number: QTCREATORBUG-2757
2010-10-25 11:40:36 +02:00
dt
9bf97a2fc6
TaskWindow: Fix connecting to both clicked and activated
...
Not really visible to the user, but lead to double activation on clicking.
2010-09-27 11:15:16 +01:00
dt
e06a03aca4
Task Window: Fix memory leak
...
Task-Nr: QTCREATORBUG-2336
2010-09-14 17:32:08 +02:00
Tobias Hunger
02c9b71d12
Revert changes that accidentally ended up in ba5750d4
...
Thanks to dt for noticing this messup!
2010-09-14 17:26:50 +02:00
Friedemann Kleint
97e7c12e3c
Code polishing, continuing cb23999fbf
...
Add more error messages to processes run for toolchain detection.
Move Windows-specific code to dbgwinutils, remove inclusion of
<windows.h>. Fix MinGW gcc 4.5 warnings.
2010-09-09 09:58:17 +02:00
Tobias Hunger
ba5750d486
Handle more make errors
2010-09-08 18:18:56 +02:00
Tobias Hunger
45865eea73
Skip tasks without files in buildissue view
...
Skip tasks withtou file information in build issue view when going
back/forward.
2010-08-26 14:01:54 +02:00
Tobias Hunger
955196c7c0
Fix task selection in a filtered list in TaskWindow
...
* Pass the correct task to the taskhandler when a task is selected
in a filtered list of the taskwindow.
Task-number: QTCREATORBUG-1950
2010-08-04 14:59:11 +02:00
Alessandro Portale
3aa3c5688f
Pedantic cleanup of filename parameters for QIcon constructor
...
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.
The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
2010-07-30 22:17:14 +02:00
con
eef08b12e3
Merge remote branch 'origin/2.0'
...
Conflicts:
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/projectexplorer/compileoutputwindow.cpp
src/plugins/projectexplorer/compileoutputwindow.h
src/plugins/projectexplorer/outputwindow.cpp
src/plugins/projectexplorer/outputwindow.h
2010-07-16 11:50:01 +02:00
dt
6fdfc6596d
Add more signals to BuildManager.
...
Enabling other plugins to know which tasks currently exist.
2010-07-15 10:47:34 +02:00
Kai Koehne
679ccc3b74
QmlOutline: Add filter for hiding bindings (properties)
2010-07-14 16:56:14 +02:00
dt
0a751084eb
Task hub
2010-07-07 11:43:03 +02:00
hjk
2f5f358ff4
Core::Context: compile hot fix for Windows.
2010-06-25 17:38:25 +02:00
hjk
c7e8b51d37
core: use a class derived from QList<int> instead of a QList<int> for Core::Context
...
A mostly mechanical change.
Reviewed-By: con
2010-06-25 12:58:07 +02:00
Tobias Hunger
4214193d21
Add method to get a task from the taskmodel
...
* Add a method to get a task from the taskmodel.
* Use it.
2010-06-24 15:58:18 +02:00
Tobias Hunger
aa41af8ccc
Use task handlers in taskwindow
...
Reviewed-by: dt
2010-06-24 15:58:18 +02:00
Tobias Hunger
d9fbf55a98
Make Task and TaskWindowPrivate classes
...
They both used to be structs.
2010-06-16 15:16:36 +02:00
Tobias Hunger
bf5c990283
Move ProjectExplorer::Task into its own file
2010-06-16 15:16:24 +02:00
con
b0040dc858
Merge remote branch 'origin/2.0'
...
Conflicts:
src/plugins/projectexplorer/taskwindow.cpp
src/shared/proparser/profileevaluator.cpp
2010-06-10 15:00:16 +02:00
dt
27bdfe510e
Make the TaskView 10% faster by caching how wide "8888" is.
2010-06-08 17:37:29 +02:00
dt
cedf9e21dc
Optimize the taskCount tracking
...
Saving another 20%
2010-06-08 17:19:25 +02:00
dt
7bfb7a62e7
Make clearing the build issue list way faster
2010-06-08 17:19:25 +02:00
dt
d807b14c85
Make TaskModel 2.5x faster
2010-06-08 15:23:58 +02:00
Friedemann Kleint
647c5d9b63
ProjectExplorer: Header cleanup in Taskwindow.
...
Introduce TaskWindowPrivate, add and reformat some
comments.
2010-05-27 13:28:07 +02:00
Friedemann Kleint
058d76fca8
TaskWindow: Fix warnings about leaking X11 pixmap data.
...
Attach icons to TaskModel.
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com >
2010-05-26 11:57:39 +02:00
dt
1f6949c19b
Fixes off by one pixel drawing in Build Issues
...
Task-Nr: QTCREATORBUG-1445
2010-05-20 16:15:27 +02:00
Tobias Hunger
e3720a4659
Add method to task to retreive the icon
...
This makes a task somewhat more useful outside of the
context of a taskwindow.
Reviewed-by: dt
2010-04-20 15:21:16 +02:00
Erik Verbruggen
fb9a9ceede
Added a method to remove individual tasks from the task window.
2010-04-16 12:54:59 +02:00
dt
2d908b558a
Add text formatting to the TaskDelegate
...
Reviewed-By: hunger
2010-04-12 15:05:29 +02:00
dt
5b2f892190
Multiline layout for TaskDelegate
...
Reviewed-By: hunger
2010-04-12 15:05:19 +02:00
Friedemann Kleint
c8b018766a
VCS: Annotate task window: Give action global context.
2010-03-19 17:50:19 +01:00
Friedemann Kleint
751d7d043c
VCS: Add 'Annotate' context menu entry to build issues task window.
2010-03-19 17:22:53 +01:00
Friedemann Kleint
bbcacaf59f
Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4.
2010-03-18 10:59:06 +01:00
dt
7c11c4d8b0
Move TaskWindow::Task out of the nesting to ProjectExplorer::
...
Since otherwise we can't forward declare it.
2010-03-12 15:00:15 +01:00
Jens Bache-Wiig
67c421f018
Remove unknown icons from compiler output
...
These icons adds visual clutter and do not really give any
added value. We should reserve icons for lines that are
known as errors or warnings as these deserve special
attention.
2010-03-10 12:10:46 +01:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
Tobias Hunger
c59912819f
Extend ioutputparser interface to improve testability
2010-03-04 15:25:14 +01:00
con
4ae45cf22e
New Error and Warning icons.
2010-02-23 17:00:50 +01:00
Friedemann Kleint
2fd8b2d7ff
Fix some code scanning issues.
...
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
Oswald Buddenhagen
75b42f18d8
Merge remote branch 'origin/1.3'
...
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636
remove trailing whitespace
...
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
Jarek Kobus
b5099480fc
Designer shortcuts fixes, TaskWindow's copy action fixed
...
Reverted the commit 59ecb9cf8 which could break wrongly written code
(or the cases like designer).
Fix one of such case (copy action in task window).
Fix synchronization of designer shortcuts by connecting to the
keySequenceChanged() signal of their Command representation.
Reviewed-by: con
Task-number: QTCREATORBUG-471
2010-01-08 13:13:56 +01:00