Commit Graph

183 Commits

Author SHA1 Message Date
Orgad Shaneh
af5b3246cf ProjectExplorer: Get rid of LocalApplicationRunConfiguration::RunMode
Change-Id: I132eb2615842ad7fdf6d7fa0f87d8c2c0c77203e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-28 13:22:11 +02:00
Orgad Shaneh
1bacbb943f De-noise RunConfigurations
Change-Id: I9def38768c0243358022f56bba80af2080ac8d05
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-28 09:38:47 +02:00
Tobias Hunger
dc61b989ac Project: Use Utils::FileName as return type for projectDirectory(...)
Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-06 11:48:10 +02:00
Tobias Hunger
8d5e4b32a8 Project: Use Utils::FileName as return type for projectFilePath()
Change-Id: If304d5e95cd9ac714100abaae35d60e3e1050eb2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-06 11:30:45 +02:00
hjk
97d98c96e5 Utils: Compile winutils on all platform
... and simplify "user" code.

Change-Id: I2dfa402f25ab83f1ab80adc0ac508e8383c69641
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-02-20 11:10:30 +01:00
Daniel Teske
534e56faaa QmlProjectRunConfiguration: Fix copy-ctor to copy all members
Change-Id: Iaf9c9da3313b9ed5201515862dbf4a8de095952a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-16 14:13:55 +01:00
Daniel Teske
d879e30d55 QmlProjectRunConfiguraiton: Simplify code
Change-Id: I392e5ee1fcf89b4e4d871fa5935f065f29a67f1e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-16 14:13:50 +01:00
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
hjk
bad8a451a6 Debugger: Remove support for non-Python GDB
This affects mainly Apple's version of GDB. Mac users are advised to
use LLDB, or some recent build of FSF GDB.

Change-Id: I6a7fbb591e79f737e12d08b0e881e9e4d1d9660c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-01-06 15:41:16 +01:00
Kai Koehne
fbe855126b QmlProject: Update current file name if file gets renamed
Task-number: QTCREATORBUG-10630
Change-Id: I7901b1204a389e6b9349e059186d0e89f7437740
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-05 14:54:03 +01:00
Kai Koehne
fe1cf36e1f Remove support for debugging JS with Qt 4.7
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>
2013-11-04 16:32:33 +01:00
Tobias Hunger
bb06ff83d7 LocalRunConfiguration: Do not add a LocalEnvironmentAspect
This makes the specializations responsible to register the environment aspect
that makes the most sense for them.

The only real user of this is the QmlProject, which added its own
EnvironmentAspect on top of LocalEnvironmentAspect set by the base
class.

Change-Id: I2ad8c23a008e249dc919491a5fd397ec04502375
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-04 14:50:47 +01:00
Orgad Shaneh
4de3b94840 Crossify normalizePathName
Denoise usages

get{Short|Long}PathName are now static. They're not used anywhere except
in normalizePathName.

Change-Id: Ief277b6d828faadd98ec7faa39dd682bfaa8805f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-24 10:38:36 +02:00
Aurindam Jana
fc0da55e1f QmlProjectRunConfiguration: Derive from LocalApplicationRunConfiguration
Change-Id: I4a7c29f2f679e62bae6fa3d01983851207e532c8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-15 17:51:50 +02:00
hjk
a37589d431 Apply 'static' pattern to MimeDatabase
Also adjust and streamline using and surrounding code.

Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-03 11:41:45 +02:00
hjk
4a24df38a3 EditorManager: Use static pattern, adjust surrounding code
Change-Id: I3255a0150cd9a730336456c5a9f986eb74fefbff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 11:22:56 +02:00
Tobias Hunger
5422b2c4da Introduce Project::projectFilePath()
Use it instead of retrieving this information from the document.

Change-Id: I809fcb2daf59021cf503c371a5d40d75d7448796
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-01 11:42:41 +02:00
Eike Ziller
354cd410b0 Make document model static and add some document related methods
Change-Id: Ibcb863e67a2433529c9d2b6dec237f9d8b1d8d50
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 11:55:59 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
Tobias Hunger
41804ac884 Remove environmentinformation from the runconfigurations
It is no longer used.

Change-Id: Ie99af7b432bba07f8e334c99817bd535828ade8b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-11 15:15:18 +02:00
Tobias Hunger
6d165c500a Specialize environmentaspect for qml projects
... and attach that to qml project runconfigurations

Change-Id: I841b72cc279495ee8f3ff31af59bf006f13a1056
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-11 15:14:59 +02:00
Friedemann Kleint
7377f4f515 Clean headers in QmlProjectManager.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I2d1d2ec5a3071de9d2a0a03bc69ec653becc7f85
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-09 09:12:23 +02:00
Tobias Hunger
ace6829742 DebuggerRunConfigurationAspect: Suppress widgets as necessary
Suppress widgets of the DebuggerRunConfigurationAspect widget as
required.

Change-Id: I4e384d4e725bd95bea51465e28e26ece3e2f5cc8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:48 +02:00
Tobias Hunger
533644290f Move DebuggerRunConfigurationAspect into Debugger
Change-Id: I03cab5d963a6d7c77171efe360a552d8109f6a8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:25 +02:00
Tobias Hunger
e474b6ed8f Demote debuggerrunconfigurationaspect
NOTE: Next patch will be "Move DRCA to Debugger plugin" and is
needed to make this functional.

Change-Id: Ie405a0e4fbdc0fb35ff16d34c725e7aee5153a4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:12 +02:00
Aurindam Jana
f8bc2cbae5 DeviceManager: Allow user to configure desktop device
Show desktop device in the Devices options page. Allow
user to configure the port range for the desktop. These
ports can then be used by others such as QML Debugger.

Change-Id: I8c4a96207e54f58d1e9bc18c417cb378dc9f70c2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-05 11:47:26 +02:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
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
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Orgad Shaneh
a24c1407a3 QmlProjectManager: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: Icac2d84abc001c963d78aa9e95911110463b4b04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-12-20 14:16:56 +01:00
Kai Koehne
f0d5ad714e QmlProject: Don't add Qt import on command line
Actually this can lead to crashes if passing the QtQuick1 import
path to qmlscene.

The removed code was introduced in 404186a919. However,
the Qt import path for the code model is also added in
QmlProject::refresh().

Task-number: QTCREATORBUG-8365
Change-Id: I8581ce3d67c83c0f27d7b8aefedf9765935bedbc
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2012-12-03 16:36:09 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Tobias Hunger
8ba422d07c s/profile/kit/
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 15:24:25 +02:00
Kai Koehne
6a92ea63e8 QmlProject: Support both qmlscene and qmlviewer in run configuration
Provide both qmlviewer and qmlscene as run configurations if the active
Qt version is 5.0.0.

Change-Id: Iaff1361921bdd2d6b2256c4c4cb51e96802c2519
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-08-23 16:05:44 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Daniel Teske
efe466d08e QmlProject: static_cast not qobject_cast
Change-Id: I8104dab231a183a7768b3c1ac8c34b7ba4e47fdb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:41:16 +02:00
Tobias Hunger
2431456216 Profile introduction
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:12 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-25 11:49:19 +02:00
Tobias Hunger
89f3c1c212 RunConfig: Rename signal isEnabledChanged(bool)
Rename signal isEnabledChanged(bool) to enabledChanged() as that is
also used by the BuildConfigurations.

Change-Id: I9fc8906a2abbf9d19e21129309bee6ff5a142117
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-29 16:53:56 +02:00
Daniel Teske
713762e108 QtVersionManager::qtVersionsChanged() split list into add/remove/change
Makes it easier to do the right thing.

Change-Id: Id6c6754033b3310c6b8c68a4aacc22cbaef268ee
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-06 11:10:59 +01:00
hjk
503c6e2684 projectexplorer: Make the debugger language chooser a (hardcoded) "aspect"
This is the first step of a larger refactoring. The plan is to make
debuggersettings more orthogonal to individual runconfiguration
implementation. This patch alone already pushes the settings handling
to the debugger plugin and removes code duplication in the
runconfiguration implementation.

Change-Id: I4c78d1658ea462d3df14b873f8f41cc918a23f1a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-21 12:21:38 +01:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-20 13:32:49 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
Kai Koehne
c158ae1337 QmlProject: Make sure 'mainFile: "xxx"' is always respected
Prevent user from overriding the file to launch through the run configuration
dialog. The old logic was broken (main file was always the editor), and
arbitrary files can now be previewed conveniently with
Tools->External->Qt Quick->Preview.

Task-number: QTCREATORBUG-6683
Change-Id: Icee1d11e5063ca634e835bb57ffc77bf973ee93f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-10 17:10:47 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Friedemann Kleint
c9ffc770aa Fix release build warnings about unitialized variables.
Change-Id: I1a6ba631b0626969b328276a91561c34154c9a1c
Reviewed-on: http://codereview.qt.nokia.com/1920
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-07-21 10:02:29 +02:00
Daniel Teske
6d2ac4e964 QmlProjectRunConfiguration: Copy enabled state on cloning
Change-Id: I9f6dcac96e4b448f008498707571a0f80a134921
Reviewed-on: http://codereview.qt.nokia.com/1668
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-07-19 18:49:38 +02:00
dt_
fec98bdf80 Add RunConfiguration::disabledReason
Not used yet

Change-Id: I76b3b81282dea4bca97eaf64e297154a20cf2096
Reviewed-on: http://codereview.qt.nokia.com/190
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-05-27 15:49:04 +02:00