| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Id49e7808b0e8e83c54d573766fcb8c25bfe6728b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
|
| |
Updated qdoc to remove hard-coded dependencies on style sheets.
Simplified the offline documentation, introducing an offline.css
file to be used for documentation in Qt Creator.
|
|\
| |
| |
| |
| | |
Conflicts:
src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/plugins/debugger/qml/qmlengine.cpp
|
| |
| |
| |
| | |
Reviewed-by: Robert Loehning
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Oswald Buddenhagen
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
... instead of running a sed script over a lot of files on each
version increment.
|
|/
|
|
|
|
| |
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.
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
share/qtcreator/gdbmacros/dumper.py
share/qtcreator/gdbmacros/gdbmacros.py
src/plugins/debugger/debuggermanager.cpp
src/plugins/debugger/gdb/attachgdbadapter.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/watchhandler.cpp
src/plugins/mercurial/mercurialjobrunner.h
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qmljseditor/qmljseditor.pro
src/plugins/qmljseditor/qmljseditorplugin.cpp
src/plugins/qmljseditor/qmljseditorplugin.h
src/plugins/qmljseditor/qmljspreviewrunner.cpp
src/plugins/qmljseditor/qmljspreviewrunner.h
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
src/plugins/qt4projectmanager/qt4projectmanager.pro
src/plugins/qt4projectmanager/qtversionmanager.h
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
src/plugins/qt4projectmanager/wizards/targetsetuppage.h
|
| |
| |
| |
| | |
Maemo and Symbian, to reuse the topics in Nokia Qt SDK documentation (with if defines)
|
| |
| |
| |
| | |
Reviewed-by: Alessandro Portale
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
doc/qtcreator.qdoc
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/debugger/debuggeragents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
doc/qtcreator.qdoc
src/plugins/bineditor/bineditorplugin.cpp
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/qtcreator.qdoc
src/plugins/help/helpplugin.cpp
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
src/tools/qml/qmldump/main.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- sprites_combined was too old (pull from Qt)
- page.png asset was not copied and used
- style.css was improved
- don't show bullets for numbered lists
- vertically center <img>s in ul or ol environment
- don't specify widths for the module name
Reviewed-By: Leena Miettinen
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
doc/qt-html-templates.qdocconf
src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
src/plugins/qmljseditor/qmljscodecompletion.cpp
|
| |
| |
| |
| |
| |
| | |
The spacing errors come from Qt, and should be fixed there.
Reviewed-By: Oswald Buddenhagen
|
| | |
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Leena Miettinen
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
doc/qtcreator.qdoc
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
|
| |
| |
| |
| |
| | |
Reviewed-by: Kai Koehne
Reviewed-by: Lasse Holmstedt
|
| |
| |
| |
| | |
Reviewed-By: Leena Miettinen
|
| |
| |
| |
| | |
Reviewed-By: Leena Miettinen
|
|/ |
|
| |
|
| |
|
|
|
|
| |
Change terminology (widget becomes component). Update and add information about using Quick Designer. Update and add images.
|
|
|
|
| |
typos. Fix capitalization. Use macros for product names.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|