aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlobserver/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove support for debugging JS with Qt 4.7Kai Koehne2013-11-041-562/+0
| | | | | | | | Remove infrastructure to debug/inspect QML applications with Qt 4.7. Change-Id: I277e9884e009475a29017f502bbe1d069317460f Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tips.cpp src/plugins/coreplugin/versiondialog.cpp src/plugins/projectexplorer/kitinformationconfigwidget.cpp src/plugins/qnx/blackberryapplicationrunner.cpp src/plugins/qnx/blackberrydeployconfiguration.cpp src/plugins/qnx/blackberrydeployconfiguration.h src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
| * Fixed Qt version in qmlobserverRobert Loehning2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | QT_VERSION_STR is being read from Qt's source directory and may differ from the version of the build being used See also printVersion() in src/app/main.cpp Change-Id: Ib740c07136e1549b0cbecc8258889688763b0b36 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlObserver: remove Symbian specific codehjk2013-01-111-37/+0
|/ | | | | Change-Id: Ic28d81daaa3b8378730fb5ea3810af7d748b54ba Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix remaining URLs and a few other things that still referred NokiaEike Ziller2012-10-091-2/+2
| | | | | Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Adjust license headershjk2012-10-051-20/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Replace Q_WS_MAC with Q_OS_MAC.Morten Johan Sorvig2012-01-261-4/+4
| | | | | | | | | | | | | | | We want to carry over all mac-specific code paths to Qt 5. WS_MAC is no longer set; OS_MAC is. This change is compatible with Qt 4 builds since OS_MAC is set whenever WS_MAC is. (OS_MAC would also be set for the theoretical X11/Mac platform, but that's anyway not a supported configuration for Creator) Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Replace qt-info@nokia.com with info@qt.nokia.comhjk2011-07-061-1/+1
| | | | | | | Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018 Reviewed-on: http://codereview.qt.nokia.com/1187 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix more krazy warnings.Friedemann Kleint2011-04-191-2/+2
|
* Update license.hjk2011-04-131-28/+18
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* Update qmlobserver with latest qmlviewer patchesKai Koehne2010-12-101-204/+337
| | | | Update qmlobserver with changes in qmlviewer until 376e636eccedb8d8bb.
* QmlObserver: Add 'show app on top' switch to creator + qmlobserverKai Koehne2010-11-231-0/+1
| | | | | | This is convenient especially in the observer mode. Reviewed-by: Christiaan Janssen
* Revert "make compile against 4.7 mainline"Kai Koehne2010-11-191-2/+0
| | | | | This reverts commit 110c58d09eaa9eba81d2c30b0b7c3e438d19b2ef, and enables qmljs debugging again.
* Merge remote branch 'origin/2.1'dt2010-11-101-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * QmlObserver: Fix compilation if no private headers are installedKai Koehne2010-11-091-1/+1
| | | | | | | | | | | | | | Use the copy of the qdeclarativedebughelper_p.h that we have in qtcreator instead. Reviewed-by: Christiaan Janssen
* | make compile against 4.7 mainlineBill King2010-11-091-0/+2
|/
* QmlObserver: Use new 4.7.1 API to enable qml debuggingKai Koehne2010-11-031-0/+4
| | | | | | | | Qml debugging is now disabled by default, and has to be enabled explicitly (b2016bbfc9). This has to be done before the QDView/QDEngine is instantiated ... Reviewed-by: Alessandro Portale
* QmlObserver: Fix "Waiting for connection ..." message box on exit (Windows)Kai Koehne2010-10-151-1/+3
| | | | | | | Disable the message box feature alltogether: Debugging output should be captured by QtCreator already. Task-number: QTCREATORBUG-2748
* QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserverKai Koehne2010-10-131-4/+0
| | | | Make Observer and JSDebugger orthogonal.
* QmlObserver: Fix compilation if no private headers are installedKai Koehne2010-10-061-2/+6
| | | | | | | Don't support the Recording + Test Script features if there are no private headers installed. Reviewed-by: Lasse Holmstedt
* QML Observer: Build together on runtime with debugging toolsLasse Holmstedt2010-09-291-0/+471
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile without creator dependencies and made it compile with debugging helpers. Reviewed-by: hjk
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 21:52:03 +0000