diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-11-11 09:46:01 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-11 09:46:25 +0100 |
| commit | 85cf2b661e668d20a56f649b118d6bdc713477e4 (patch) | |
| tree | 4dfb59750827bb34ea566dae6c637a17577cf974 /src/plugins/plugins.pro | |
| parent | 920ed1140edab10f8fa6d40974cd6ad4fed55c85 (diff) | |
| parent | d099d6856ee2b259923201b384ff58b75f2c358e (diff) | |
| download | qt-creator-85cf2b661e668d20a56f649b118d6bdc713477e4.tar.gz | |
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
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 061be55ec8..b1eff599b7 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -22,9 +22,7 @@ SUBDIRS = plugin_coreplugin \ plugin_qt4projectmanager \ plugin_locator \ plugin_debugger \ -# plugin_qtestlib \ # this seems to be dead plugin_help \ -# plugin_regexp \ # don't know what to do with this plugin_cpaster \ plugin_cmakeprojectmanager \ plugin_fakevim \ |