Commit Graph

40362 Commits

Author SHA1 Message Date
Orgad Shaneh
c1ef8edaf9 Core: Use a document subclass for restored documents
Enables name disambiguation for restored documents as well as "real" ones.

Change-Id: Id9c97fa03647e2724612b732091fc92c183c1a17
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 16:14:45 +00:00
Thomas Hartmann
e8c8968ab6 QmlDesigner.QmlPuppet: Show import error messages on root item
* If an import fails we show this as an error on the root item.
* If all imports fail (including the QtQuick import) we also
  show an error message, but try to recover using QtQuick 2.0.

Change-Id: Ibfece2acdb9f2a6ba26dfd9b31607507fec82dd1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-03-09 16:14:28 +00:00
Thomas Hartmann
7c192f6490 Adding more zoom levels
Change-Id: I61f313477821e87c1f2234953caa922e9105ad41
Task-number: QTCREATORBUG-13951
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-03-09 16:14:22 +00:00
Orgad Shaneh
17f2af5082 Fix parsing of filename with position when -client is used
Instead of transforming to absolute paths in the client, pass the
working directory and leave it to the target.

Change-Id: I4f8724c8857e89a7ee77116c78cf8b25c56795fa
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 16:10:03 +00:00
Daniel Teske
facc89fafd Optimize ProjectTree for adding folders/files
Instead of searching the whole tree for the current node,
only check the newly added files/folders.

Change-Id: I015a955815223767367c4cad476d0620f69abd71
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-09 15:47:00 +00:00
hjk
159f4e4f39 Debugger: Replace LocalsUpdateForNewFrame enum value by a bool
Change-Id: I4e7f6ec14a4c40a7d402e6a57f1b14fc37651747
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-09 15:17:56 +00:00
Thomas Hartmann
0ebbcc5615 Add combo box to change the background of the form editor
Task-number: QTCREATORBUG-11352
Change-Id: I73cca4ff86005d929a26af83a1765e9b7a313952
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-03-09 15:13:32 +00:00
Daniel Teske
fa5d4b92a7 QmlProjectManager: Fix initial state
Change-Id: I1b06e2b3f787671b18feef9bd85d971f7e5a27c0
Task-number: QTCREATORBUG-13970
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 14:48:14 +00:00
Robert Loehning
559d8dc203 Squish: Fix tst_simple_analyze
Change-Id: I56a7c2a651fc9d2701cf650279a677856b6cf84c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-09 14:36:56 +00:00
Sergio Ahumada
2c876f7443 Update some more links to qt.io
Change-Id: I043cf78f128dc8d99e3316b951cf91d2f6d6524a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 14:30:39 +00:00
Orgad Shaneh
5db2af5c80 Theming: Use a dark yellow color for info bar
Change-Id: I04a06d40c8b95ff90a138e47e21ef29cbac29e9a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 14:22:03 +00:00
Eike Ziller
09a16cf223 QNX/MimeTypes: Do not open empty xml files in bar descriptor editor
In case of doubt the mime type alphabetically first is taken, so make
sure application/xml comes first.

Change-Id: I52d0aded3f4cc3f428c797cf6d97c070ce5495b8
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 14:20:28 +00:00
Eike Ziller
ba64a7bb1b MimeDatabase: Fix that xml files were opened in bar descriptor editor
Fix MIME detection issues with magics in MIME hierarchies

Assume two MIME types A and B are registered, both with the same glob
pattern, A being parent of B, A with some magic rule, and B with another
magic rule. Given a file that matches the glob pattern and the magic rule
of A, the resulting MIME type depended on the order of registration of A
and B, because it would just check if some glob matching MIME type was
also a subclass of the magic matching MIME type.

The patch prefers the the MIME type that matches by magic if that
matches by glob pattern as well (i.e. A in our example).

The "recommended checking order" of the spec does handle that case.

Change-Id: Ia914aa7b6d0fb52f6c833897a5be69eb59fca6ab
Task-number: QTBUG-44846
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 14:04:02 +00:00
Eike Ziller
6ecde4cdf0 MimeDatabase: Fix leak on invalid magic
Introduced by 673be1a3f8

Change-Id: Ia937b3607d6a709b86185f428a6e3ff1202e0869
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 14:03:52 +00:00
Orgad Shaneh
220882128a Utils: Fix parentheses parsing in arguments iteration
Opening parenthesis is stored in the value, but closing parenthesis
is not. This makes the value unbalanced.

Since the parenthesis unconditionally unset m_simple, the value is
cleared anyway and is never read.

In case that math (or other) expression will ever be evaluated, this
needs to be reworked to include both parentheses.

Change-Id: Ie56f5a5d9cec5a47649751db4245888bee8e85d8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-03-09 13:41:49 +00:00
Orgad Shaneh
dbb9891f43 CppEditor: Support implicit pointers in Qt5 connect conversion
Task-number: QTCREATORBUG-14104
Change-Id: I157dbcb0e06ed1bf49d2df01bdbad215e35a4c3a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-09 13:27:12 +00:00
Orgad Shaneh
683540bee7 CppEditor: Expand templates for Qt5 connect conversion
Fixes at least explicit data() calls for templated pointers:

QPointer<QAction> action;
connect(action.data(), SIGNAL(triggered()), this, SLOT(slot()));

Change-Id: I7f76c1f556c0f271936728d611751424969916a7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-09 13:16:06 +00:00
hjk
ef894f21e2 Debugger: Rename WatchHandler::remove{Data->ItemByIName}
That's what it does.

Change-Id: If1a1bf91220630ad09e5ec8636ccb9d67c8d0947
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-09 11:52:52 +00:00
hjk
915bb5413c Debugger: Remove unused WatchHandler::removeChildren()
Change-Id: Ieef352db04978ad48dfe47178edaec7702dc373b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-09 11:52:45 +00:00
Christian Stenger
4a9bf879fc Squish: Fix generic highlighter test
New MIME type handling differentiates between Haskell and
Literate Haskell.

Change-Id: Iaf1cabb5720b47a893b0755f59b3626d01835ca6
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-03-09 11:48:18 +00:00
Orgad Shaneh
7e66dc2cbe QmlDesigner: Fix dead store
Change-Id: Ie9a0beffe770fc2cf9f8172b23660f10b56dcbd4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-03-09 11:40:34 +00:00
hjk
3e02f8ec2e Debugger: Fix format switching for char[]
Task-number: QTCREATORBUG-14094
Change-Id: Iea1f59d5af2fb453ead7e0cef9e04293a698794e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-09 11:17:25 +00:00
Daniel Teske
74f67ffef4 Remove support for !shadowBuild
In ancient times we needed to support some qt versions that didn't support shadow
building. This code has been unused for some versions now, so remove it completely.

Change-Id: I311f255d6bfed6841e94c9c383bd9929d0d55520
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-09 10:45:31 +00:00
Daniel Teske
357d01817b QmakeProjectManager: Rework run qmake action
Relied on some broken magic.

Change-Id: I1641f4b135e825ef60d57e99741def018ab9b55a
Task-number: QTCREATORBUG-13700
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 10:45:10 +00:00
Orgad Shaneh
e93484d480 QmakePM: Fix crash when Qt version is not set
Reported in the mailing list

Change-Id: I111f66cdff99e7b9ee5bbfe887e87546377a137f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-09 08:41:04 +00:00
Tobias Hunger
6b5bf41188 SubmitEditor: Add scrollbars when necessary
Task-number: QTCREATORBUG-5579
Change-Id: I013f08de15317b02eda3b64ea4ac2fe58e919db0
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-09 08:39:22 +00:00
Orgad Shaneh
7dd4093b18 Debugger: Remove dead store
Change-Id: I162d8db39755df1fe4b94b2dedfa83680f87a786
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-09 08:36:12 +00:00
Orgad Shaneh
0831b0c2ca Core: Remove dead store
Change-Id: I3388751d8b68747afbdc75354430be744736b8e7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 08:00:44 +00:00
Przemyslaw Gorszkowski
c9cc5156e7 ClassView: removed dead code
Change-Id: Ifda4eea91f6007a0b16d03f31e54be92c1afd70a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-09 07:15:45 +00:00
Orgad Shaneh
10b4936038 Valgrind: Fix memory leak
Change-Id: Ie2e3104a71dcb0bff6fff7d2989517cc3ca5de2b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-09 07:09:08 +00:00
Orgad Shaneh
9a1c382273 VCS: Remove dead stores
Change-Id: I998e523c76bdc0b76cbc6089092a0dda4812ca16
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2015-03-08 08:20:28 +00:00
David Schulz
7db238c116 Cdbext: Discard old watches when syncing...
... to make sure everything is new evaluated.

Change-Id: I256e044e0095c0c4d2e4563474768ba2fdc3c85e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-06 14:13:48 +00:00
David Schulz
bc124ff97f Cdbext: Optimize Qt detection.
Now supporting fast look up of linbinfix builds and
adding support for static namespace builds.

Change-Id: Iea234902e915b9a9d08ccf804ea4a37810aaa0d8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-06 14:13:40 +00:00
David Schulz
22b0a061b0 Cdbext: Fix dumping QString from a namespaced Qt5.
Change-Id: I87736b04160a64058a20786aafb1381460c6c5f3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-06 14:13:31 +00:00
hjk
7b6ff1fed9 Debugger: Remove unneeded parameter from WatchModel::insertDataItem
All remaining uses had 'destructive' as 'true'.

Change-Id: I4eee6539c7b5e0336325a59af3379f8a3140847b
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 14:00:32 +00:00
hjk
e4c2582b62 Debugger: Dissolve WatchHandler::insertBulkData
Change-Id: Ie2b073531f28943e78e89157798fef1645d4aa2b
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:59:54 +00:00
hjk
3f79ae203f Debugger: Start disentangling WatchHandler::insertData
Rename the list overload. Make the single item overload use
the direct path to insertItem, hook the column resize requests
to the showing/hiding of the watchers pane.

Change-Id: I0a1940c8e1919341a815e6bccbcf55d989d663da
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:59:42 +00:00
hjk
46fcfa9018 Debugger: Remove widget argument from tooltip request
The only information ever used is whether it's c++ or not.

Change-Id: I4ca00663856dd66cbdf58c468f175a8c9e41d6a5
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:57:53 +00:00
hjk
34c807a11a Debugger: Remove WatchUpdateFlags
Only needed in the non-Python days. CDB didn't use it to start with.

Change-Id: Ia609218cc1a694f797e278c4d99ead68e6212938
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:55:55 +00:00
hjk
7c2c3307b3 Debugger: Simplify GdbEngine::updateWatchData
The removed parts were only used with the non-Python engine.

Change-Id: Ia6858517b011c6f7ace8b2521beafdb4b03efc89
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:54:56 +00:00
Orgad Shaneh
329c493764 Utils: Modernize connections
Change-Id: I4650abc84e7c82a4054197319f6c849af9e5b8ce
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:47:27 +00:00
Orgad Shaneh
0c5dac717e Dumper: Fix literal dumping for template name
Change-Id: I41aab8da071745f8675ef9a7bcf2f6ca0f2fbd3e
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:30:06 +00:00
hjk
df00a7af64 Debugger: Move watcher modification from delegate to model
We don't need the remove/re-insert cycle in the new model,
so the expression modification can be done directly.

Change-Id: If9626f48fcfbcf75e61d332afb59b986da6c2dbc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 12:47:55 +00:00
Ulf Hermann
862f9a46e6 Timeline: Add some forgotten braces
This broke window recalculation when the window was clamped
against the trace end.

Change-Id: I6c62e1440476ea9e36b08a2edd3e0c3bb2dec931
Task-number: QTCREATORBUG-14105
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-03-06 11:54:33 +00:00
hjk
a7bf3c49a4 Debugger: Remove WatchHandler::insertIncompleteData
... and replace at caller side it with the used parts
of the code.

Change-Id: Id612c66ac6d95bfc12aba16e9247cc81991dd779
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 10:40:30 +00:00
hjk
74f7cd1c26 Debugger: Simplify watcher handling in GdbEngine
There was only one user on GdbEngine::insertData left, and this
always took the !isSomethingNeeded branch.

Change-Id: Ibe51f7a7689be39ad3ffd60099a9cbe7b614648a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-03-06 09:49:23 +00:00
David Schulz
36fe342853 Cdb: Reduce insertIncompleteData usage.
Change-Id: Ia71d32c40bbe4737061d021c37844a1fd84b9657
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 09:28:30 +00:00
Christian Stenger
1641d9a59e Vcs: Fix compile for Qt < 5.4
Introduced with 7a05c9ea5b

Change-Id: Iddf3c3ace15e1f79acc59d4024f796428b1a4713
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-06 08:58:19 +00:00
hjk
b981f5049d Debugger: Let LldbEngine pass current token to dumper
Change-Id: Ifea751354f637f67e640d36ba1baa95678c86ee9
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 08:43:37 +00:00
Hugues Delorme
a0f8a67d7a Bzr: use Qt5 connects in BazaarPlugin
Change-Id: Iaa264abd266cdbaa34212f5d3faca21f855c6bbb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-06 08:05:25 +00:00