Eike Ziller
85cf2b661e
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/plugins/debugger/qml/scriptconsole.cpp
src/plugins/git/gitplugin.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h
Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
hjk
f80db703bb
use Core::Id for ids in INavigationWidgetFactory
...
Change-Id: Ic793e01edf6a4d2fe61baadb3aa5bef817436d35
Reviewed-by: Eike Ziller <eike.ziller@nokia.com >
2011-11-10 15:46:13 +01:00
hjk
31600758de
all: s/info@qt.nokia.com/qt-info@nokia.com/
...
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com >
2011-11-03 10:33:19 +01:00
Tobias Hunger
aa2acec14c
Fix/add copyright headers
...
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
Tobias Hunger
fe33a0984e
More copyright fixes
2011-02-18 10:37:19 +01:00
Friedemann Kleint
edb4893547
Header cleanup in src, specify module name.
2011-01-24 12:29:48 +01:00
Denis Mingulov
b23b4588bf
Navigation Widget: add 'Priority' support
...
Merge-request: 176
Reviewed-by: hjk <qtc-committer@nokia.com >
2010-09-09 14:39:59 +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
Kai Koehne
cc48ee0ab6
Outline: Disable filter button if no filters are available
...
Fixes that the filter button could be 'checked' for a cpp file.
2010-07-22 13:03:38 +02:00
Kai Koehne
88bcb98230
Outline: Exchange position of Filter, Sync buttons
...
Make it the same order as in the Projects sidebar
2010-07-22 13:03:38 +02:00
Kai Koehne
97ca483d33
QmlJSOutline: Store the filter settings when switching files
2010-07-16 14:10:02 +02:00
Kai Koehne
f0c7ef6270
Outline: Store status of sync button in settings
2010-07-16 14:10:02 +02:00
Kai Koehne
679ccc3b74
QmlOutline: Add filter for hiding bindings (properties)
2010-07-14 16:56:14 +02:00
Kai Koehne
0adadf0ff4
Make default background of outline white.
...
Requested by con.
2010-07-14 08:09:56 +02:00
Kai Koehne
5439ce976e
Add new Outline sidebar pane
...
Adds a generic Outline pane to the sidebar. The CppEditor & QmlJSEditor
plugins will implement the IOutlineWidget/IOutlineWidgetFactory interface to
provide views specific to C++/Qml/JS documents.
Reviewed-by: con
2010-07-08 14:02:51 +02:00
