| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.
Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
| |
Change-Id: Ifde220d33f73501cc05079e30f4610530eb910ab
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
| |
Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
|
|
|
|
|
| |
Change-Id: I6f90bff623437b25887bdd288987c013a45029be
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
| |
Change-Id: Ic7a721a085b9849195a91d49daf3d685e499e121
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
| |
Change-Id: Iae2c15efe25580fb616bdc3dd4b8ff3581cd481a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
| |
Add either QtDeclarative (Qt 4) or QtQuick1 (Qt 5) to QT.
Mixing them leads to problems with include paths and linking.
Change-Id: I188240641216ee227931a7be2105bc4838385c79
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ideaf91b2f9ce3d9252ca40b7224a2ab4238341f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Icbc8d105a3ffea2bf705d18e3413f6b3487ccfd3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Change-Id: Id298e9d6af8f5cbc35f0f57e612690d9a43cea2f
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I6fe594c2c9d6921ac18344f05f71f72b49b69928
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljscheck.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Certain plugins (example, updateinfo) should not be included
in a binary release, but we want to provide & build them by
default to ensure they still compile.
Defining the qmake variable IDE_PACKAGE_MODE will skip
them in the build process.
To still enable the UpdateInfo plugin, also define UPDATEINFO_ENABLE.
Change-Id: I256467edfd1e6ec272562e68e9ef19599e864185
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|/
|
|
| |
This reverts commit 22ddf7083e98e6a78edaf36350544e445dbdcf40.
|
|
|
|
| |
Change-Id: I593517c64b43d327a1fc6f9c9ca0c5c8f2aed588
|
|
|
|
|
|
|
|
|
|
|
| |
The new plugin contains everything specific to Maemo and MeeGo
as supported by the MADDE framework.
This leaves the RemoteLinux plugin with abstract base classes and
generic implementations.
Change-Id: I6068caa758214cf26a27fe9893e0817b7834b580
Reviewed-on: http://codereview.qt-project.org/5230
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Always compile but never run it unless UPDATEINFO_DISABLE
is being set to 'false' via qmake or environment.
Change-Id: Ie53fb2ea99bfebac1b6f416939554f25a5e481a7
Reviewed-on: http://codereview.qt-project.org/4483
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
debugger links against cpptools library
Change-Id: I9c1435cf1511f2962e11b5ef488b9764024aa7f1
Reviewed-on: http://codereview.qt-project.org/4959
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Compile on Windows.
Change-Id: I54a4df0cee585713979d37fe7b838f5a5cf4a7be
Reviewed-on: http://codereview.qt.nokia.com/1150
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It breaks compilation.
This reverts commit 25793bdc95716b3a23cf24106775ac621e7cb728.
Change-Id: Id5cfe4c90b28f964abd6499dcf9eee2fd64a74b3
Reviewed-on: http://codereview.qt.nokia.com/1141
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I9bc3811088c4bc78f0aba2bb375d7d47f15e9f2c
Reviewed-on: http://codereview.qt.nokia.com/1037
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The plugin adds a navigator pane which shows a tree of all tests
'found' in the project, as well as Test Result output panes.
Tests can be edited in an editor and executed from within the IDE.
This is the first in a series of commits, ending with documentation.
Change-Id: Iee91cf991810347cb2f3a428f7457ea75e0c5b57
Reviewed-on: http://codereview.qt.nokia.com/2020
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I60a5db0d9927fa51662f944462fb0b776de48662
Reviewed-on: http://codereview.qt.nokia.com/1924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|/
|
|
|
|
|
| |
Change-Id: I9bc3811088c4bc78f0aba2bb375d7d47f15e9f2c
Reviewed-on: http://codereview.qt.nokia.com/1065
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
|
| |
Implements new XML-based format for examples, demos & tutorials
Done-with: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Change-Id: I42c0afdb419cffe5637cd4f298e828d09e0fb15a
Reviewed-on: http://codereview.qt.nokia.com/840
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Id02b393655bb05a4a93dff8449b045ffe61ec79a
Reviewed-on: http://codereview.qt.nokia.com/782
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I31d1938194574dbc90b4df948b70781679f4830d
Reviewed-on: http://codereview.qt.nokia.com/472
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Make sure qt4projectmanager is built before qmlprofiler gets linked.
Change-Id: I34efcdd431c18b5941e0748213fec0b8e80d1600
Reviewed-on: http://codereview.qt.nokia.com/469
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I5022b1861bc9b4c001bad3ddfac2a18030a343db
Reviewed-on: http://codereview.qt.nokia.com/280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
No change in functionality for now. More support for generic remote
Linux support is planned to be added.
The changes in decreasing order of magnitude:
1) Move contents of qt4projectmanager/qt-maemo to new "RemoteLinux" plugin.
2) Make some classes in qt4nodes public for now. More decoupling
in that area will follow.
3) Fix some minor problems uncovered by the move.
Change-Id: I51d0c7977c10019eb6080cd6620bc28ecebad3c4
Reviewed-on: http://codereview.qt.nokia.com/106
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.
Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
It is hard to imagine there is a real use case that someone wants one but
absolutely not the other.
Change-Id: I58bb57912f2edeacf2d5a24e3b2eb5a81262eabd
Reviewed-on: http://codereview.qt.nokia.com/66
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
| |
Use the copy of QDeclarativeDebugClient we ship with qtcreator.
However, since the internal one misses a waitForConnected any connection
will right now fail.
|
|
|
|
| |
Replace use of sleep() call with a timer.
|
|
|
|
| |
Reviewed-by: Kai Koehne
|
| |
|
| |
|
|
|
|
|
| |
Merge-request: 284
Reviewed-by: hjk <qtc-committer@nokia.com>
|
| |
|
|
|
|
| |
It aint ready yet.
|
| |
|
|
|
|
|
| |
Merge-request: 260
Reviewed-by: hjk <qtc-committer@nokia.com>
|
|
|
|
|
| |
Merge-request: 260
Reviewed-by: hjk <qtc-committer@nokia.com>
|
|
|
|
|
| |
Merge-request: 260
Reviewed-by: hjk <qtc-committer@nokia.com>
|
|
|
|
|
| |
Merge-request: 229
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
|
|
|
|
| |
attempts
|
|
|
|
|
|
|
|
|
| |
(Cmake/Qt4). Use PluginManager invocation facility
for the form class code generation. Do the rest
(testing for form editor, retrieving the editor
contents).
Acked-By: hjk
|
| |
|