Commit Graph

34072 Commits

Author SHA1 Message Date
Tobias Hunger
a8ea31bf09 FileUtils: Add static method to construct FileNames from Latin1
Change-Id: Ida513eb0537e2ef0c55887d0df21de956e85e983
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-11 10:46:09 +01:00
hjk
a19353674c Debugger: Stop process before manipulating breakpoints with LLDB
This seems to be a LLDB/Linux specific problem.

Task-number: QTCREATORBUG-11441
Change-Id: I390e17737a63f53dc1d1e2060ef87a3ad94fedf5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-11 10:44:54 +01:00
hjk
c7f80c2c00 Debugger: Fix reaction to unsupported types of breakpoint.
Task-number: QTCREATORBUG-11434

Change-Id: I5b295df0db85063146ed9dc09351844924e22bdc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-11 10:05:20 +01:00
Orgad Shaneh
f8b7b9849f Update changelog for 3.1.0
Change-Id: I0919dbaeaf52504b342f7b5943dba6e1693be69a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-11 09:38:13 +01:00
Eike Ziller
b03a981a41 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
2014-02-11 09:14:22 +01:00
Eike Ziller
1f0665a3e2 Help: Update fallback online documentation URL
Documentation is now on qt-project.org instead of doc.qt.digia.com.

Change-Id: I5e90a41cc908b0daf7fd7beca594c10d87f3c694
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-11 09:09:55 +01:00
Tobias Hunger
2e45c1d8d4 Qbs: WS cleanup.
Change-Id: I2f0fbba63f7a61f541dc4d78f4bee24ef2369dc8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-10 17:36:37 +01:00
hjk
b60fb8aeab QmjJSEditor: Some style.
q and d are special, no need to allocate private timers dynamically.

Change-Id: Ide121c59d17c3129296651b360c8b173efadeedb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-10 16:47:09 +01:00
hjk
74aa5e998f Debugger: Update executable filename from core if possible
Task-number: QTCREATORBUG-10219

Change-Id: Ib17c23c7e8bfdad4f1dbcaf7757fdb130fba2abf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-10 16:34:41 +01:00
Tobias Hunger
49871ea236 Target: Avoid needless switching of active RunConfigurations.
Together with the previous patch this avoids recreating RunConfiguration
widgets for RCs which are about to be removed because they are no longer
valid.

Task-number: QTCREATORBUG-10248
Change-Id: Ia8e394175c1cdef469faa8d117a2736500d928e4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-10 15:16:48 +01:00
Ulf Hermann
8af54aa44c QmlProfiler: Show Javascript calls in timeline view
Change-Id: I781b95bdd9d6bfa12ec8f40f4197119ba51e194a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-10 14:28:45 +01:00
Ulf Hermann
54eedf4e59 QmlProfiler: Show Javascript calls in events view.
Change-Id: I11d22ce1423384f879e30ff9573f4d7d799535b1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-10 14:28:38 +01:00
hjk
779ac6971c QmlJSEditor: Compile fix
Change-Id: Ida9dda777993be01561b299d17a2e9d712b66432
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-10 14:14:14 +01:00
Eike Ziller
23274136f6 QmlJSEditor: Use ICore::dialogParent for component dialog
And remove a then unused function.

Change-Id: I85f6db88af060192f3ee2587ba4cb5a55f8860fd
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 13:17:52 +01:00
Eike Ziller
104ec050f2 QmlJSEditor: Remove unused forward declarations
Change-Id: I23afc3f7324bf91eb8aa6b42fa734705a7f0cbd5
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 12:43:55 +01:00
Eike Ziller
deb1a742e1 Make QmlJSEditor and QmlJSEditorWidget internal
Change-Id: I5afe67db927d735727beafe972965855bde39faa
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 12:43:46 +01:00
Eike Ziller
6944dc7af8 QmlDesigner: Use QmlJSEditorDocument instead of widget
It doesn't need the widget in this case, so the preferred way is to use
the document.

Change-Id: I5ff3943603c6883f27f29702cf48a30992204179
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 12:43:39 +01:00
Eike Ziller
89a2c4620b QmlJSEditor: Remove functions from widget that delegate to document
Instead access document directly. Needs to export document.

Change-Id: I8fa86832982d2793ea951e88a5b6e3925b7cd281
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 12:43:30 +01:00
Eike Ziller
9167d4a16c QmlJSEditor: Make struct internal
Isn't used anywhere outside.

Change-Id: I4094d9334b81fd9e0309b574d0725cdd9cb87bd5
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 12:43:23 +01:00
Eike Ziller
07e807ee5f QmlJSEditor: Remove unused method.
Change-Id: I5441317ab8e8ef285099828c57fb008efd757ed9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 12:43:17 +01:00
Eike Ziller
58b717fbb8 QmlJSEditor: Move outline model to document
Also the updating of the model is now done only once in the document,
and delayed till an editor is visible if necessary.

Change-Id: I69b1abebc2b691b37a618db7d1f5ebbbc8e75bca
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 12:43:12 +01:00
Eike Ziller
1e6bc2758d QmlOutlineModel: Use document instead of widget
Change-Id: I56c4a1da84d00064334a235aec8f2710efdba365
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 12:43:06 +01:00
Eike Ziller
9fcd43ed05 QmlJSEditor: Some renaming
Call the timer and its slot for what they do, not how they are
triggered. Remove unneeded function/slot.

Change-Id: I6060f0b59149eb7e5cfdf1d7ea0a993a2104f012
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-10 12:42:54 +01:00
Rafael Roquetto
82401803b3 Implement BlackBerryConfigurationManager test
Change-Id: If7dba1fe1dae3a25aa2e991c85ed724101241a22
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2014-02-10 12:10:43 +01:00
Rafael Roquetto
3d78ae3393 Qnx: Use reference instead of pointer for singleton
BlackBerrySettingsManager returns a reference for a good reason.

Change-Id: Ib358beef12f1df0fc089e54f309f3b0ded640a83
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2014-02-10 11:46:45 +01:00
hjk
fd93aa4377 ProjectExplorer: Some mime type consolidation
CPP_SOURCE, CPP_HEADER and FORM where duplicated,
LINGUIST is not really specific to qmake.

Change-Id: Iac27f74c2b9dbed5fc44c5dd08b9ba47802cc758
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-02-10 10:51:51 +01:00
Orgad Shaneh
346f0c3177 Git: Remove unused functions
Change-Id: I279dcf1ee1c1fe16d3a1fd866af4f9cc4a8c9070
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-10 10:44:25 +01:00
hjk
f1f4093ba5 ExternalEditors: Remove direct dependency on qmake
Change-Id: I3f7193c43fcb0b02e3621fc03b08962b534f441e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-10 10:39:52 +01:00
Jarek Kobus
f156c3e013 Move DiffEditorController into DiffEditorDocument.
Prepare for making diff editor splittable.

Change-Id: I285ad46d095a98f2707d385558dfda0b10b77c1f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-10 10:33:39 +01:00
Tobias Hunger
97895e9026 HistoryCompleter: Do not use a generic ids for history entries
Do not use BuildDir.History, SourceDir.History or WorkingDir.History.

Change-Id: I0df95b88680efdc2ecaec68625ab476499ee1fb8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-10 10:25:52 +01:00
Tobias Hunger
5559e64c7e Cmake: Add history completer to path chooser
Change-Id: Ib747ce4903668799a47011ae7cddfd898aaf722b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-10 10:25:44 +01:00
Tobias Hunger
68a28781e1 Autotools: Add history completer to path choosers
Change-Id: I8de6f4b93fea29165e9c553165991734fcde6ed6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-10 10:24:57 +01:00
hjk
3e1ae6bf3a Debugger: Make 'Jump to Address' work with LLDB
Change-Id: Iba288df0db85063146ed9dc09351844924e22bdc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-10 10:18:17 +01:00
hjk
f10a81b6e5 ProjectExplorer: Remove unused variable
Change-Id: I76c5f7dd198247467ecd4b1ffd0b6ff60c43b3f5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-10 10:17:59 +01:00
hjk
f4d94df84a Debugger: Run to line for LLDB
And some error reporting.

Change-Id: Iab298df0db85063146ed9dc09351844924e22bdc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-10 10:17:53 +01:00
Tobias Hunger
506fd3c155 GenericProject: Add history completer to path choosers
Change-Id: Ibc3981771f6720ae28dec1b87e91326e997702e9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-07 15:59:24 +01:00
Tobias Hunger
8b3de15100 Hg: Add history completers to path choosers
Change-Id: Ia7bfb9d1703a73d358fdf05bf41223209c78d45c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-07 14:23:59 +01:00
Tobias Hunger
7cef40ae25 Qbs: Add some tooltips to QbsBuildStepWidget
Change-Id: I45d42eadc449a11dc022224af416ca4ab6567e23
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-07 14:04:22 +01:00
Rafael Roquetto
7be3909ae8 Qnx: implement "Newest API level" option
The "Newest Api level" virtual option matches the most up-to-date version of
the installed APIs. If a more recent version is then afterwards installed, it
will point to it. Likewise, if the most recent version is uninstalled, it will
default to the next most up-to-date version.

Change-Id: Ic0609df92ff9108f897559e80a108e22c6bc11a0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-07 13:25:06 +01:00
Kai Koehne
542444c926 Move QtVersionsModel declaration into header
Change-Id: Ic61139ef5e8819bb0ae2ba67cfff6b5adc55c14d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-07 10:44:59 +01:00
Orgad Shaneh
6182841c13 CppEditor: Remove unused function
Change-Id: I4ebcf66d39192cd099d7cdc6ec27e74837975ed3
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-07 10:41:21 +01:00
Oswald Buddenhagen
cdc2a0f723 fix raw data leak in $$sprintf()
it could be only triggered by abusing the function (no expansion
actually done), and nobody is using this to start with, but still ...

Change-Id: I3d4a23ae4d1eea07955572d8213094e0dc218f6d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-07 10:08:13 +01:00
Oswald Buddenhagen
701a82d3a2 micro-optimization: use ProStringList::join(QChar) overload
Change-Id: I25c6205df78da7fbee0ad1b04476f528f376b7a6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-07 10:08:00 +01:00
hjk
b7c664627e ProjectExplorer: Improve 'ps' output parsing.
- Get rid of distinction between Mac and other Unices. Instead,
  use POSIX syntax that should work on all compliant systems
  (tested on OSX and Linux).
- Actually extract command instead of just setting it to
  the same value as the whole command line. This is not correct in the
  presence of spaces in the command, but better than before.

Change-Id: Ie25155688e0e9bbe0d45cde20563929b7370695d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-07 09:36:37 +01:00
Eike Ziller
39a29dcfd9 Fix build with msvc2010
override on destructors are not very useful anyhow, but also msvc2010
doesn't like them at all.

Change-Id: I2d5f4b0d6148c5e66d2cba604d305707269d12e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-07 09:26:22 +01:00
Tobias Hunger
e9cf16b701 HistoryCompleter: Do not overwrite text in the FancyLineEdit
Do only set the first item of the completion list if there is no
text in the line edit when the completer gets attached. Otherwise
we might overwrite default values that we actually expect to stick
around.

Task-number: QTCREATORBUG-11291
Change-Id: Iee9aa2a5475b840ede201f306e3b4164c6e88120
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-06 18:32:53 +01:00
Fawzi Mohamed
242b839375 ios: use QTC_OVERRIDE consistently
Change-Id: I154b70896b359e09f53607bedd968a5e7a0ab148
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-06 17:46:55 +01:00
Tobias Hunger
2d4cfc90fc Make sure to generate qmake friendly file names
According to Ossi the only safe characters in a path for qmake are
alphanumerical, underscore, dot and dash.

Task-number: QTCREATORBUG-10980
Change-Id: Ibacbfeb7f04f1f0524093f1d8fce637ea4ae6fd6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-06 17:30:46 +01:00
Tobias Hunger
b684f0afb5 VCS: Make General options page look more uniform
Task-number: QTCREATORBUG-11411

Change-Id: I0c2f2ec9cfb45aea7861b2f594cbc84b973db68d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-06 16:50:21 +01:00
hjk
f413ff0bc4 Debugger: Make LLDB main loop exception reporting more verbose
Include the full call stack.

Change-Id: Ib2a18df0db85063146ed9dc09351844924e22bdc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-06 16:18:31 +01:00