| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Change-Id: I638554936eae2db7ff2f55508d13f1c52c07f17d
Reviewed-on: http://codereview.qt.nokia.com/2114
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
|
|
|
|
|
|
|
|
|
| |
Avoid extra allocations since we only the actual line for the case.
Change-Id: I0d0f0db394d9075bbdce24d1d5b5efa55c52f9b3
Reviewed-on: http://codereview.qt.nokia.com/261
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I5177c5d46409225a8debda2e0f78fffdea27b266
Reviewed-on: http://codereview.qt.nokia.com/208
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
| |
With the completion now in a separate thread this should
no longer be necessary.
Reviewed-by: Roberto Raggi
|
| |
|
|
|
|
| |
Approved-by: legal
|
| |
|
|
|
|
| |
Reviewed-by: Friedemann Kleint
|
|
|
|
| |
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: Lasse Holmstedt
|
|
|
|
|
|
|
|
| |
simply add
CONFIG += depend_includepath
to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them
were missing anyway, and i wouldn't expect it to ever change. not
touching src/shared/ for syncing reasons.
|
|
|
|
|
| |
Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
|
|
|
|
| |
We use the latter style everywhere else to signify the end of a namespace block.
|
|
|
|
| |
Task-number: QTCREATORBUG-3613
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Instead of using the pre-processed source, the original one is used.
This makes a difference when a macro is used in the line, where the pre-
processed source would have a "#gen true" token.
Task-number: QTCREATORBUG-3345
|
|
|
|
|
|
|
|
|
| |
The problem was that the scope of the class declaration in a template-class
declaration is the template, not the scope in which that template is defined.
The scope-check was not taking this into account.
Task-number: QTCREATORBUG-3183
Reviewed-by: Roberto Raggi
|
|
|
|
| |
Reviewed-by: hjk
|
|
|
|
|
|
|
| |
There was trouble when a plugin qmlRegisterType'd something like 'Item'
into the global default module.
Reviewed-by: Roberto Raggi
|
|
|
|
|
|
| |
By moving the offending code into a background thread.
Reviewed-by: Erik Verbruggen
|
|
|
|
| |
Reviewed-by: Erik Verbruggen
|
|
|
|
|
|
|
|
|
|
| |
Previously they were leaked when a qmldump or the C++ exported QML
type list updated.
Just deleting the previous FakeMetaObjects is not an option, as they
might still be used in a QmlObjectValue owned by an Engine.
Reviewed-by: Erik Verbruggen
|
|
|
|
| |
Reviewed-by: Erik Verbruggen
|
|
|
|
| |
Reviewed-by: Roberto Raggi
|
|
|
|
| |
Reviewed-by: Roberto Raggi
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Make available for log simplification, etc.
Add autotest, fix broken std::set and MSVC.
Rubber-stamped-by: Christian Kamm <christian.d.kamm@nokia.com>
|
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-2313
Reviewed-by: Roberto Raggi
|
|/
|
|
|
|
| |
qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes
it fail in pri files that are used for app pro files. The tests still
don't run because of run time linking issues.
|
| |
|
|
|
|
| |
Reviewed-by: Erik Verbruggen
|
|
|
|
| |
Reviewed-by: Christian Kamm
|
|
|
|
| |
(cherry picked from commit b049937ae013b47e9b86aacd60325dbd382319ed)
|
|
|
|
| |
(cherry picked from commit 519f1d11947ff3109850e559fae868c4a55deb43)
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
- Changed generator to generate:
- Changed AST::lastToken to return 1 if there is none
- Changed Bind.cpp to set the scope of the block following a control
statement to extend upto (and not including) the first token after
the block. So basically, including any whitespace after the control
statement.
Reviewed-by: Roberto Raggi
|
| |
|