Oswald Buddenhagen
1fda2111d4
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
src/plugins/qmldesigner/designercore/include/widgetqueryview.h
src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qnx/bardescriptormagicmatcher.h
src/plugins/qt4projectmanager/profilekeywords.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370
Incremented year in copyright info
...
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-01-29 16:27:03 +01:00
hjk
ca76c704fd
BaseTreeView: add convenience function to get selected or current rows
...
Change-Id: I3239c52ad2d1eb725e4c10aeb93ee2e73ad5c0b6
Reviewed-by: hjk <qthjk@ovi.com >
2013-01-10 15:54:08 +01:00
Eike Ziller
ba1d5f2cdf
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
share/share.qbs
src/plugins/cpptools/cppchecksymbols.cpp
src/plugins/texteditor/behaviorsettingswidget.cpp
Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
2012-11-27 11:50:56 +01:00
Aurindam Jana
46101b0bb2
Inspector: Update Editor on object selection
...
When an object is selected in the Inspector, the
Editor is updated to show the relevant code.
Task-number: QTCREATORBUG-8246
Change-Id: I4f7fbcccdeb22849682fa72c63e87a78f48d185b
Reviewed-by: hjk <qthjk@ovi.com >
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com >
2012-11-26 15:04:56 +01:00
hjk
dd6307ea15
debugger: generally use a QLabel as item delegate in views
...
Change-Id: I11f75bd620ec11521b902ccc3ab434c24393dcfd
Reviewed-by: hjk <qthjk@ovi.com >
2012-11-08 10:20:59 +01:00
hjk
386ca7c8dd
Adjust license headers
...
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2012-10-05 17:12:56 +02:00
Eike Ziller
e0e8cf3ada
Contact -> qt-project.org
...
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-19 13:23:21 +02:00
Daniel Teske
7e7f5aced6
Fix memory leak
...
Change-Id: Ie6faa0ba729e5359c64ea684c85fab1e188e2136
Reviewed-by: hjk <qthjk@ovi.com >
2012-06-28 12:26:34 +02:00
Aurindam Jana
ecdecd4e97
DebuggerTreeView: Move base class to utils
...
Change-Id: I3313789be5f835d218cad5ed5f3143aee18e9f5f
Reviewed-by: hjk <qthjk@ovi.com >
2012-04-03 09:28:57 +02:00
