| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
Reviewed-by: hjk
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
share/qtcreator/static.pro
src/plugins/cppeditor/cppeditor.cpp
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
src/plugins/qt4projectmanager/qtoutputformatter.cpp
src/plugins/texteditor/generichighlighter/highlightersettings.cpp
|
| |
| |
| |
| | |
Reviewed-by: dt
|
| | |
|
| |
| |
| |
| |
| | |
... instead of running a sed script over a lot of files on each
version increment.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
helper classes from TextEditor::Internal to TextEditor as they
are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
README
doc/qt-html-templates.qdocconf
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
src/app/Info.plist
src/plugins/bineditor/BinEditor.pluginspec
src/plugins/bookmarks/Bookmarks.pluginspec
src/plugins/classview/ClassView.pluginspec
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
src/plugins/coreplugin/Core.pluginspec
src/plugins/coreplugin/coreconstants.h
src/plugins/cpaster/CodePaster.pluginspec
src/plugins/cppeditor/CppEditor.pluginspec
src/plugins/cpptools/CppTools.pluginspec
src/plugins/cvs/CVS.pluginspec
src/plugins/debugger/Debugger.pluginspec
src/plugins/debugger/breakhandler.cpp
src/plugins/designer/Designer.pluginspec
src/plugins/fakevim/FakeVim.pluginspec
src/plugins/find/Find.pluginspec
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
src/plugins/git/ScmGit.pluginspec
src/plugins/helloworld/HelloWorld.pluginspec
src/plugins/help/Help.pluginspec
src/plugins/imageviewer/ImageViewer.pluginspec
src/plugins/locator/Locator.pluginspec
src/plugins/mercurial/Mercurial.pluginspec
src/plugins/perforce/Perforce.pluginspec
src/plugins/projectexplorer/ProjectExplorer.pluginspec
src/plugins/qmldesigner/QmlDesigner.pluginspec
src/plugins/qmljseditor/QmlJSEditor.pluginspec
src/plugins/qmljsinspector/QmlJSInspector.pluginspec
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/regexp/RegExp.pluginspec
src/plugins/resourceeditor/ResourceEditor.pluginspec
src/plugins/snippets/Snippets.pluginspec
src/plugins/subversion/Subversion.pluginspec
src/plugins/tasklist/TaskList.pluginspec
src/plugins/texteditor/TextEditor.pluginspec
src/plugins/vcsbase/VCSBase.pluginspec
src/plugins/welcome/Welcome.pluginspec
tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
tests/manual/fakevim/fakevim.pro
tests/manual/ssh/errorhandling/main.cpp
|
| | |
|
| | |
|
| | |
|
|/
|
|
|
|
| |
Should have been done earlier. 2.1.80 was burned in the pre-2.1.0->2.0.1
days, and we'd like to have odd subminor for 'working' and even subminor
numbers for pure cherry-picking release branches anyway.
|
| |
|
|
|
|
|
|
|
|
| |
- Move RSSFetcher to CorePlugin
- Rename RSSFetcher to RssFetcher
- Make RssFetcher more generic, allow multiple sources to be fetched
- Introduce Featured Items on Getting Started page
- Introduce dummy entry for Mobile examples, needs implementation once they are ready
|
|
|
|
|
| |
Merge-request: 178
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
|
|
|
|
|
|
| |
Introduce some more private classes for the coreplugin,
use header include convention
<QtModule/QClass>, de-qobjectify VariableManager.
|
|
|
|
|
|
|
|
|
| |
Rename 'QML standalone application' to 'QML application'
and the 'old-style' QML applications to
'QML Viewer based applications'.
For the QML renaming:
Rubber-stamped-by: Alessandro Portale <alessandro.portale@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.
That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
|
|
|
|
|
|
|
| |
Fix README, some spelling errors, remove contractions,
exclamation marks, correct some plural forms, join split messages.
Add QCoreApplication::translate to non-Q_OBJECT-classes.
Fix some lupdate warnings about discarding meta-data (//:).
|
|
|
|
| |
It's more complicated then expected, to be detangled another day
|
|
|
|
|
| |
Switch to Edit Mode once we constructed it in Core::init(). Switch to a
the Welcome Mode in Core::extensionsInitialized. Also works
|
| |
|
|
|
|
| |
Task-number: QTCREATORBUG-2071
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
| |
Core::Context
A mostly mechanical change.
Reviewed-By: con
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
README
doc/qt-html-templates.qdocconf
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
src/app/Info.plist
src/plugins/bineditor/BinEditor.pluginspec
src/plugins/bookmarks/Bookmarks.pluginspec
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
src/plugins/coreplugin/Core.pluginspec
src/plugins/coreplugin/coreconstants.h
src/plugins/cpaster/CodePaster.pluginspec
src/plugins/cppeditor/CppEditor.pluginspec
src/plugins/cpptools/CppTools.pluginspec
src/plugins/cvs/CVS.pluginspec
src/plugins/debugger/Debugger.pluginspec
src/plugins/designer/Designer.pluginspec
src/plugins/fakevim/FakeVim.pluginspec
src/plugins/find/Find.pluginspec
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
src/plugins/git/ScmGit.pluginspec
src/plugins/helloworld/HelloWorld.pluginspec
src/plugins/help/Help.pluginspec
src/plugins/locator/Locator.pluginspec
src/plugins/mercurial/Mercurial.pluginspec
src/plugins/perforce/Perforce.pluginspec
src/plugins/projectexplorer/ProjectExplorer.pluginspec
src/plugins/qmldesigner/QmlDesigner.pluginspec
src/plugins/qmlinspector/QmlInspector.pluginspec
src/plugins/qmljseditor/QmlJSEditor.pluginspec
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/regexp/RegExp.pluginspec
src/plugins/resourceeditor/ResourceEditor.pluginspec
src/plugins/snippets/Snippets.pluginspec
src/plugins/subversion/Subversion.pluginspec
src/plugins/texteditor/TextEditor.pluginspec
src/plugins/vcsbase/VCSBase.pluginspec
src/plugins/welcome/Welcome.pluginspec
|
| | |
|
| |
| |
| |
| | |
Reviewed-By: kh1
|
|\| |
|
| |
| |
| |
| | |
Reviewed-by: Oswald Buddenhagen
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/projectexplorer/miniprojecttargetselector.cpp
src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
tests/manual/gdbdebugger/simple/app.cpp
|
| |
| |
| |
| |
| |
| |
| | |
I now cache the scaled welcomemode background so it feels more
responsive when toggeling back and forth between modes.
Reviewed-by: joao
|
|\|
| |
| |
| |
| | |
Conflicts:
src/plugins/cpptools/cppcodecompletion.cpp
|
| |
| |
| |
| |
| |
| | |
The scaled pixmap has been reduced in size to speed up the
plugin loading and refresh times. Stylesheet has been
slightly optimized as well.
|
|\|
| |
| |
| |
| | |
Conflicts:
src/plugins/texteditor/texteditoractionhandler.cpp
|
| |
| |
| |
| |
| | |
The text color was incorrect for certain dark color schemes,
including the latest Ubuntu theme.
|
|\| |
|
| |
| |
| |
| |
| |
| |
| | |
This should keep QNAM from blocking the startup in some network setups.
Reviewed-by: dt
Task-number: QTCREATORBUG-1250
|
|/ |
|
| |
|
|
|
|
|
|
|
|
| |
I introduced some graphical details in the background
that replaces the gradient. I also fixed the foreground
square a bit to get rid of the blurry line at the bottom.
Reviewed-by: danimo
|
| |
|
|
|
|
|
|
| |
No need for scrolling after my last commit.
This reverts commit 577057d2a96edc48ad28a1f62285928616bf3d56.
|
|
|
|
| |
to able to scroll long lists again.
|