Commit Graph

451 Commits

Author SHA1 Message Date
Daniel Teske
b778692510 Qml run controls automatically stop all run controls for the same file
That's something which has been asked for multiple times. Also related
to the task below.

Change-Id: I1130a2a3527479f18bde2abfbff28fb556f437b9
Task-Nr: QTCREATORBUG-3508
Reviewed-on: http://codereview.qt.nokia.com/1844
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-07-19 18:53:15 +02:00
Daniel Teske
7d39539657 Header cleanup
Change-Id: I86680fcac2712203cb02fd9ce6d944988e6ef340
Reviewed-on: http://codereview.qt.nokia.com/1825
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-07-19 18:09:45 +02:00
hjk
82bbac7f90 Remove unneeded defines.
Mostly Q_DISABLE_COPY that were covered by the un-copy-ability of the
respective base classes. Includes a few "stylistic" whitespace changes.

Change-Id: I31ca0e7bada5ed0f34776976efe22ddc444a5bf2
Reviewed-on: http://codereview.qt.nokia.com/1609
Reviewed-by: hjk <qthjk@ovi.com>
2011-07-14 12:15:38 +02:00
Christian Kamm
4285b48455 QmlJS: Dump builtins per Qt version.
Change-Id: I7b5179c4b33c24e83baf0536d158dd48d277637f
Reviewed-on: http://codereview.qt.nokia.com/1305
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-07-11 11:28:38 +02:00
Aurindam Jana
8668fb776f Check QMLType when adding new QML files to project to prevent error message being shown
Change-Id: I68df3c69b535d47109bfb94c3089fd78e8b3683d
Reviewed-on: http://codereview.qt.nokia.com/514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-27 14:59:51 +02:00
Kai Koehne
3485d7f5ca QmlDebugger: Always use ',block' argument
This will allow e.g. the JS Debugger to catch scripts running at startup.

Change-Id: I00d339b06f1ed2b716c62bd2d53a32c2b20b1ddc
Reviewed-on: http://codereview.qt.nokia.com/377
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-06-08 14:39:13 +02:00
hjk
b9580e3ccf debugger: let debugger attach to currently running process
Change-Id: I4aab1aa84a3dc9211d84d59be76005a8e841239e
(cherry picked from commit 55e399b524721e3561b6c7faae8aef84bf064565)
Reviewed-on: http://codereview.qt.nokia.com/251
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-05-31 13:34:40 +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
dt_
fc90ea3c10 Remove BuildConfiguration parameter from RunConfiguration::isEnabled
Noone used it anyway, makes the code easier to refactor later.

Change-Id: I367c3f15ec5034740760dfe1becd3063b2e19dc1
Reviewed-on: http://codereview.qt.nokia.com/187
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-05-27 15:15:43 +02:00
Christian Kamm
1c401481f2 QmlProject: Don't crash if there's no active target.
Change-Id: I0fd95f0d388f4ba06936ec9164a91a3c53a0f005
Reviewed-on: http://codereview.qt.nokia.com/104
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-25 11:04:35 +02:00
dt
754be1bcfc Move a lot of qmake independent classes to a new plugin qtsupport
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>
2011-05-24 18:35:11 +02:00
Oswald Buddenhagen
7c2afcf179 fix "Debugger:" label alignment
on the way also greatly simplify the code in most copies. it was
probably trying to do what i did, but failed miserably.
2011-05-17 14:45:44 +02:00
Oswald Buddenhagen
9ac137fb06 add auto-saving of modified editors
Task-number: QTCREATORBUG-2847
2011-05-12 20:10:03 +02:00
Thorbjørn Lindeijer
2b0266d0ee Disable observer and jsdebugger services when they're already part of Qt
As of Qt 4.8 the observer and jsdebugger services are part of Qt. This
means the following changes are necessary in Qt Creator:

* Do not link to the QmlJSDebugger library.
* Do not create JSDebuggerAgent and QDeclarativeViewObserver instances
  in the QmlApplicationViewer and use the new declarative_debug CONFIG
  option to enable those services in Qt. This is done automatically
  for debug builds.
* Point out the QML Debugging Library and the QML Observer are "Not
  needed" in the Qt options page.
* Change the label in qmake options from "Link QML debugging library" to
  "Enable QML debugging". It still remains as a way to enable this
  functionality in release builds or for QtQuick applications not based
  on Qt Creator's template.
* Rely on qmlviewer for debugging QML UI projects rather than the
  observer, which is no longer necessary.

Reviewed-by: Kai Koehne
2011-05-12 15:56:05 +02:00
dt
8e171e0be0 Qt Version refactoring
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.

Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.

Completly change the qt in path autodetection to be only
a fall back if no configuration was found.

Note: For now the old settings are not removed, as such 2.2 and master
can coexist.

Reviewed-By: hunger
2011-05-12 12:23:06 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Kai Koehne
03cf8c4b90 QmlProject: Rename QmlRunControl to QmlProjectRunControl
It's just easier if all the classes related with the QmlProject file format
start with the same prefix.
2011-05-04 13:05:57 +02:00
Kai Koehne
ea36927cc3 QmlDebug: Simplify logic to find the source file for a stack frame
Get rid of custom logic to handle shadow builds (which didn't work
anyway if the qml files are from a different directory than expected).
Instead, just search for the file name in the list of files from the
project.

Reviewed-by: Christiaan Janssen
2011-04-27 17:25:48 +02:00
con
14487af86c Merge remote branch 'origin/2.2'
Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/projectexplorer/target.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
2011-04-27 11:27:29 +02:00
con
2cf76ead26 Move OutputFormatter to Utils lib. 2011-04-26 10:45:21 +02:00
Kai Koehne
c3e2fd9ed7 Fix "File name case mismatch" error when debugging QML apps (Win)
Work around QTBUG-17529 by normalizing the capitalization of the
working directory (which we do already for launching apps without
debugging).

Task-number: QTCREATORBUG-4592
Reviewed-by: Friedemann Kleint
2011-04-20 15:21:41 +02:00
Christiaan Janssen
9a8cf34e63 QmlDebugger: breakpoints in symlinked qmlprojects
Task-number: QTCREATORBUG-4405

Reviewed-by: Kai Koehne
2011-04-19 17:00:38 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
2011-04-18 14:10:14 +02:00
Oswald Buddenhagen
fae7dc9584 add errorString output argument to IFile::reload() & IEditor::open()
add/unify read error handling in all affected classes
2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
f1f9904d35 add errorString output argument to IFile::save()
this centralizes error reporting (in fact, in most cases it adds any in
the first place).

Task-number: QTCREATORBUG-1619
2011-04-18 14:10:13 +02:00
Friedemann Kleint
f5cbf87965 Utils: Introduce FileSystemWatcher.
Remove duplicated classes ProjectExplorer::FileWatcher
and QmlProjectManager::FileSystemWatcher, create
Utils::FileSystemWatcher from them, merging the functionality.

Also use in HelpManager/Maemo, reducing the number
of QFileSystemWatcher instances (and thus, shutdown time).
2011-04-15 15:55:11 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
Jarek Kobus
4d69c7455e Remove unused constants, fix lacking virtual destructor
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-04-14 12:08:47 +02:00
Christiaan Janssen
cbfaea1ed3 QmlProfiler: qmlproject support
Reviewed-by: Kai Koehne
2011-04-14 09:57:08 +02:00
Kai Koehne
855582de91 QmlProject: Fix import of .qmlproject.user files from 2.1
We changed the semantics of an empty 'mainScript' in the .user file:
In 2.1 it translated to 'use current file', while in 2.2 the default is now
to use the file specified in .qmlproject.

However, if there is no mainFile specified in .qmlproject we should
fall back to the current file in editor.

Reviewed-by: Christiaan Janssen
2011-04-13 15:45:18 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
dt
880813a3bc Fixing tons of application output
Master fixed a bug where a newline was almost always prepended to any
output. As a side effect of that a lot of messages which outputed no
newline broke. This commit fixes the obvious ones, probably missing a
few.
2011-04-12 19:42:25 +02:00
hjk
1738d08ffc projectexplorer: move project{Context,Language} from IProjectManager to Project
Reviewed-by: dt
2011-04-12 12:46:26 +02:00
con
1c2da511b9 Merge remote branch 'origin/2.2'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
2011-04-01 09:53:09 +02:00
Jarek Kobus
c688a39b91 Update source strings
Reviewed-by: Pawel Polanski
2011-03-30 15:59:50 +02:00
dt
28cf277cc1 RunControl: Show correct icon in application output
Add a virtual icon() method to runcontrol.
Actually currently the icon only varies between modes of running.

Task-Nr: QTCREATORBUG-1232
2011-03-28 19:58:26 +02:00
con
3de823ca62 Merge remote branch 'origin/2.2'
Conflicts:
	qtcreator.pri
	src/plugins/projectexplorer/toolchainmanager.cpp
2011-03-28 11:40:45 +02:00
dt
fc0573ccdf QmlProject: Show error message if the project file was deleted
Task-Nr: QTCREATORBUG-4195

Reviewed-By: kkoehne
2011-03-23 15:27:22 +01:00
Oswald Buddenhagen
4e2937bf48 Merge remote-tracking branch 'origin/2.2'
Conflicts:
	src/plugins/debugger/debuggersourcepathmappingwidget.cpp
2011-03-23 14:42:31 +01:00
Oswald Buddenhagen
feff022186 dispose of dynamic resolution of GetLongPathNameW and GetShortPathNameW
everything links to kernel32 anyway
2011-03-21 21:11:40 +01:00
Christian Kandeler
439b45618e Start making the Maemo support more generic.
This includes:
    - decoupling deploy configurations from targets (Reviewed-by: dt)
    - adding a "Generic Linux" device type
    - splitting up the Maemo deployment step into small pieces that
      can be combined in different ways (and much more easily maintained)
    - adding a new version handler for pro.user files
      (Reviewed-by: Tobias Hunger)

Also:
  - Add and use an SSH manager class for easier connection sharing.
  - Make the SSH connection parameters a fixed attribute of the connection.
2011-03-09 13:10:19 +01:00
Milian Wolff
09f89d52be enable adding custom config widgets from a run control factory
To achieve this there are two methods in IRunControlFactory you
need to implement:

1) createRunConfigurationAspect returns a IRunConfigurationAspect
which stores the settings specific to your plugin.
2) createConfigurationWidget returns a RunConfigWidget that will
be shown in the project settings

Merge-request: 258
Reviewed-by: hjk <qtc-committer@nokia.com>
2011-02-28 12:23:12 +01:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
Kai Koehne
5d615f7fbf QmlDebug: Enable 'What are the prerequisites?' link in run configuration
DebuggerLanguageChooser is in utils, which is why we cannot directly open
the URL in the help plugin.
2011-02-25 09:24:39 +01:00
Kai Koehne
8a82f11202 QmlProject: Remove unneeded class declarations 2011-02-24 13:45:39 +01:00
hjk
a8ae618d75 toolchain: fix enum naming style
Reviewed-By: Tobias Hunger
2011-02-23 17:56:33 +01:00
Tobias Hunger
8d0c477245 ToolChain: Refactor toolchain support
Refactor ToolChains in Qt Creator:

 * Allow for several toolchains of the same type
 * Be smarter wrt. guessing what kind of output a toolchain
   produces. This allows us to eventually handle e.g. embedded
   linux setups way better than before.
 * Be smarter wrt. guessing what kind of environment a Qt version
   needs.
 * Improve auto-detection of toolchains a bit
 * Decide on which debugger to use based on the kind of output
   produced by the compiler.
 * Add options page to configure toolchains
 * Remove toolchain related options from the Qt version dialog

Reviewed-by: dt
2011-02-21 18:33:23 +01:00
Kai Koehne
21b1854040 QmlProject: Add copyright header 2011-02-18 11:50:28 +01:00
Thorbjørn Lindeijer
7741db1220 Code cosmetics 2011-02-16 11:36:06 +01:00
Friedemann Kleint
f37d9b55aa L10n: First round of tr()-Fixes for 2.2 2011-02-14 16:37:20 +01:00