Eike Ziller
236ea9efb9
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
share/qtcreator/debugger/dumper.cpp
share/qtcreator/debugger/dumper_p.h
share/qtcreator/debugger/test/main.cpp
src/plugins/debugger/gdb/classicgdbengine.cpp
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.h
src/plugins/debugger/lldblib/guest/main.cpp
src/plugins/debugger/lldblib/ipcengineguest.cpp
src/plugins/debugger/lldblib/ipcengineguest.h
src/plugins/debugger/lldblib/ipcenginehost.cpp
src/plugins/debugger/lldblib/ipcenginehost.h
src/plugins/debugger/lldblib/lldbenginehost.cpp
src/plugins/debugger/lldblib/lldboptionspage.cpp
src/plugins/qbsprojectmanager/qbsstep.cpp
src/plugins/qbsprojectmanager/qbsstep.h
src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
src/plugins/qnx/blackberrycheckdevmodestep.cpp
src/plugins/qtsupport/debugginghelper.cpp
Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863
Incremented year in copyright info
...
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2014-01-08 08:29:47 +01:00
jkobus
3996faa9cd
Remove unused attribute
...
Change-Id: I0cc6c5a63afbcab0e937db7230c1a979a306957a
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-11-19 10:57:46 +01:00
Orgad Shaneh
4442a92729
Braces cleanup
...
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-11-14 08:13:52 +01:00
jkobus
62590507b1
Merge multi Qt Quick UI wizards into one
...
Change-Id: Ia984c36864dacd5b71c76976a351767bb4c3693c
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-11-06 10:23:49 +01:00
hjk
c4d1d7f278
Core: Clean up some ICore::instance() uses
...
Change-Id: I888b30094ed75818ee3af58c94ebf8468afa5eb9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-09-24 09:57:55 +02:00
Thomas Hartmann
acb7d2cd5b
QmlApplicationWizard: translation fix
...
The translation contexts did not match and there was
a mistake in the .xq for xmlpatterns file.
Change-Id: Ibb454e82d6f197014451399cbb8a9fc0bad04a98
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2013-06-20 10:02:48 +02:00
Friedemann Kleint
b4ac33c752
Compile fix in QmlProjectManager.
...
Change-Id: Icd180542d2b8393562d05ce25dd70b8f48942220
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com >
2013-01-30 11:29:26 +01:00
Friedemann Kleint
a565bc1ded
Fix warnings/messages in QmlApp.
...
Do not translate warnings, use qWarning().nospace() consistently.
Fix message.
Change-Id: I4f278b4e3b5fdfadf81cdae45520a132da83aa86
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-01-30 11:07:42 +01:00
Friedemann Kleint
1bb0a7f174
Fix compilation with Qt 5.
...
Q_GLOBAL_STATIC_WITH_INITIALIZER was removed.
Change-Id: Ie030f2fa66c97ae1bfd8ede95c573453a7f03d2a
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-01-24 08:57:14 +01:00
Thomas Hartmann
11dac02809
fix compile for Qt 4
...
Change-Id: Ifa6c3857e82e7fe8facf6c2437ce01134ee0615e
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-01-11 15:35:19 +01:00
Thomas Hartmann
d26ec5048f
QmlProjectPlugin: replacing QmlProjectApplicationWizard
...
The new wizard is template based. This allows easy addition of
custom QML templates and also allows us to add more QML wizards
for e. g. components later.
This template mechanism allows substitution in comment, which
allows us to keep valid QML file as templates.
This reduces the maintance burden significantly.
Change-Id: I7766b037635131da2af5aae518d6fe4597ff8b9f
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-01-11 14:59:12 +01:00
