Commit Graph

44854 Commits

Author SHA1 Message Date
Tobias Hunger
3167644839 TaskList: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: Ib0dfa475ac26893ef78d8757e0e58a15daa77e3b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-20 07:46:37 +00:00
Tobias Hunger
bbb7f180f1 Perforce: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I3617564f4cff494423c42c1665a4e54c503101c2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-20 07:46:25 +00:00
Tobias Hunger
5795da85f8 Mercurial: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I97ec9abd338ec686a0d62fadc59b6e7338f065cc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-20 07:46:18 +00:00
Tobias Hunger
b3e0adf476 VcsBase: Use Qt5-style connects
The bulk of the heavy lifting was done by clazy

Change-Id: I3d8904d3c5d22aecf5e5baefacc4dd9b77371417
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-20 07:45:59 +00:00
Martin Kampas
71e84f9646 Abi: Choose word width of 32b for x86 target-triplets
Change-Id: I537949d3348024954214a6e271d8ca6194a58f53
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 06:19:58 +00:00
Jochen Becher
83c26bf290 ModelEditor: break source lines in header files
Change-Id: Id88890a9961976c576c96f0713f7aa61897878d1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-19 16:58:13 +00:00
Jochen Becher
62e3e87309 ModelEditor: Fix endless loop with class members
Using Q_INVOKABLE in class members led to endless loop. 
Other qualifiers like Q_SLOT or virtual do work.

Task-number: QTCREATORBUG-15347
Change-Id: Id25ee7970b49ed815a86fa76af6cbb3a06405971
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-19 16:24:21 +00:00
Tobias Hunger
bf48d54b27 Convert to Qt5 style connects
Use Clazy fix-old-style-connect to turn most connects to Qt5 style.

Change-Id: Ib81da329a7c1f5cf3e76536cbcc729a5c5d6dd56
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2015-11-19 16:22:52 +00:00
Alessandro Portale
7932fd0ec4 Qt Quick Designer: Use QPixmap for navigator view delegate
...and rename the member variables accordingly.

Change-Id: I5dfc4e76efdec5e1b3267710ec1e06c500a61763
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2015-11-19 16:13:09 +00:00
Leena Miettinen
1ed73ea36c Doc: fix links to previous and next pages
...for moved pages

Change-Id: Ic52376b73687676c0e09fefc5a53f10c328c18c8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-19 15:39:12 +00:00
Leena Miettinen
306c4a695f Doc: add missing \l command to fix a link
Change-Id: I2af5d8eca8ce40e1c674b7463ddbf71d27fc794d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-19 15:38:44 +00:00
Nikolai Kosjar
0498fb68ff C++: Revert lookup to 3.4.2
...which was least buggy.

The bugs fixed by the changes we revert here (highlighting/completion
for code involving templates) were minor compared to ones we currently
have. Those bugs will be addressed by the clang code model anyway.

Relevant commits were collected via:

  $ cd ${QTC}/src/libs/cplusplus
  $ git log \
   --no-merges \
   --format=oneline \
   v3.4.2..HEAD \
   -- LookupContext.* ResolveExpression.* TypeResolver.* TypeOfExpression.* \
      ../../plugins/cpptools/cppcompletion_test.cpp

From this list the following were skipped due to irrelevance:

  88c5b47e53 # CppTools: Minor cleanup in completion tests
  e5255a1f5c # CppTools: Add a test for ObjC not replacing dot with arrow
  5b12c8d63a # CppTools: Support ObjC in member access operator tests
  9fef4fb9ca # CPlusPlus: Fix warnings about overriding visit(...) methods

There were only minor conflicts while reverting those.

This changes touches so many files because there were quite some
cleanups and renames after the 3.4.2 release.

Task-number: QTCREATORBUG-14889
Task-number: QTCREATORBUG-15211
Task-number: QTCREATORBUG-15213
Task-number: QTCREATORBUG-15257
Task-number: QTCREATORBUG-15264
Task-number: QTCREATORBUG-15291
Task-number: QTCREATORBUG-15329
Change-Id: I01f759f8f35ecb4228928a4f22086e279c1a5435
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-19 14:48:38 +00:00
Ulf Hermann
ed85f4cfe2 QmlDebug: Remove old variant of connection failure message
That must have been from Qt Quick 1 times.

Change-Id: I53044fbb6c4f9cfc412a3a44f20c75ae606bc8a8
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-11-19 12:45:12 +00:00
Leena Miettinen
c2a2883c4a Doc: move the "Modeling" section to end of "Coding"
Because the model editor does not generate code from the
diagrams and is therefore mainly meant for documenting code.

Change-Id: I43d2dd3436df4914f5be6f8b2f52586de1522138
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-19 12:43:22 +00:00
Ulf Hermann
f877d0a9d0 QmlDebug: Remove unused (and unimplemented) slots
Change-Id: I63fa74184e930d86b42a101600f6402e3c46ba48
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-11-19 12:28:17 +00:00
Ulf Hermann
ffc11d5e9e QmlProfiler: allow for multiple sequential traces to be aggregated
Task-number: QTCREATORBUG-13317
Change-Id: Ic7d1d5c94d8d522741b6c4207a21a43f521da5fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 12:16:44 +00:00
Ulf Hermann
030acfdf73 QmlProfiler: Send the client recording state to new engines
Otherwise some engine can stop recording by sending a "Complete" event
and that will be the state we send to any new engines, although the
recording button was checked when the recording started.

Also, don't redirect state changes and the associated recording state
sending through a signal and slot. This allows us to remove the
"enabled" property of QmlProfilerTraceClient and adapt the signature
of sendRecordingStatus() to facilitate the redirection of newEngine()
through the client manager.

Task-number: QTCREATORBUG-13317
Change-Id: Ie9dc6785eb761514bc96aaf5724f7b23d3c2932e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 12:16:41 +00:00
Ulf Hermann
d7f6dec98e QmlProfiler: Use correct coding style and remove dead code
Change-Id: I10967ee080076d40cf54aaf4ae28c63d78b7f216
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 12:16:38 +00:00
Ulf Hermann
d58b714a3a QmlProfiler: Debug messages are no QML events ...
In particular, they can also occur if we're not AcquiringData.

Change-Id: Ia310206ee15973fc5b2fa1c607d7c9a48b6f435f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 12:16:35 +00:00
Ulf Hermann
4416acc16d QmlProfiler: Remove unused "gap" feature
Change-Id: Ie3efdf4a7b54e470b6a3d3a7ab78277b7ab19218
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:33:25 +00:00
Ulf Hermann
7b4e253a1e QmlProfiler: Support local connections on Qt >= 5.6
This removes the need to receive messages from the application via
stderr. The "Connecting to socket" is still parsed, but only for
diagnostic purposes. If it doesn't arrive, the profiling will still
work.

Change-Id: I022691293da2a1e671ba1263bc76e4044bf1a5b7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:33:20 +00:00
Ulf Hermann
2217eef3a3 QmlDebug: Allow different styles of command line arguments
We have tcp, local, and native by now. We have to expose that in a
clean way.

Change-Id: I0ce7be693aa7f47ebea7abe435a224a176b6c94b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:33:15 +00:00
Ulf Hermann
e1dd3cf701 Remove unused include
Change-Id: Ica45c05004aacbd209067eb2a77bb5b94585a2a0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:33:02 +00:00
Ulf Hermann
93c157e3f7 QmlDebug: Allow connecting through a local socket
This removes the necessity for listening to debug messages, as the
server is created by QtCreator then. Also, most of the time the
connections are local anyway, and TCP is a waste for that.

Change-Id: Ie5e1d7ba55dbda035a9ea7432f3af13915813de9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:32:58 +00:00
Ulf Hermann
6b2cad3e53 QmlDebug: Use proper interfaces between debug connection and client
Mutual friend declarations are not the most beautiful thing ...

Change-Id: I0f3c2a3c0cb9bc018b63d73b463a9068278e705e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:32:53 +00:00
Ulf Hermann
db6a65210c QmlDebug: Rework public/private QmlDebugConnection
Follow the common pattern. The private object doesn't have to be a
QObject after all.

Change-Id: Ife5693444fb910b6803e47ea3742815d8aa8d63e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:32:50 +00:00
Ulf Hermann
81eea72d44 QmlDebug: Simplify error and state signaling
There is no point in sending two signals for every state change and
error. Also, the signals only reflect events in the socket, not in the
logical connection.

Change-Id: I617a925c69164aa1a02a7781b9da7dca55daa304
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:32:46 +00:00
Ulf Hermann
47317eff60 QmlDebug: Rename some members of QmlDebugConnection
This is to adopt the naming to the code in src/qmldebug in
qtdeclarative. Once we can require a version of Qt that has qmldebug
for building QtCreator we can then remove our own version of this code.

Change-Id: I573f0703871b5812789c5c7a6287567d5c2875e6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:32:42 +00:00
Ulf Hermann
a3e4a28bee QmlDebug: Unify QPacket and QmlDebugStream and remove unused code
There is no point in having both as they serve the same purpose. Also,
most of the packet protocol API was never used or tested, and wrapping
each byte to be sent into a QPacket is wasteful and unnecessary.

Change-Id: Ia421eae33b644fe86a53bcd04092a84ea3000f0d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-19 11:32:39 +00:00
Leena Miettinen
d6284c5863 Doc: changing file encoding from editor toolbar
Change-Id: I0931f1f4cd9641662fdaf5e67943e6b85c19c1c0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-19 09:42:41 +00:00
Ulf Hermann
55afbb59e1 Timeline: Allow zooming with ctrl-wheel
Change-Id: I83f18af8394c9820e07e7bb41a627bf33e98d6c4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
2015-11-19 09:27:35 +00:00
Ulf Hermann
7c410663c1 Timeline: Introduce properties for zoom constants
minimumRangeLength and maximumZoomFactor should be accessible from QML.
Also, the timer offset is obviously not the same as minimumRangeLength,
and as the exact number doesn't matter we give it a different value to
make that clear.

Change-Id: I9cc0289809b14ed32ec06a49276e31ce7b86a301
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
2015-11-19 09:27:31 +00:00
Alessandro Portale
19eb9e4f06 Todo: Store icons in the settings via index instead of strings
This allows us to use something else than a string in order to reference
icons. For an upcoming patch this will be necessary.

Since this patch introduces a settings structure change, a migration
feature from the old "Keyword\iconResource" string to the new "Keyword
\iconType" int is implemented.

Change-Id: Ia5695418fb135510ed549cf9a7cb59aab5389f31
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-11-18 17:12:53 +00:00
Nikolai Kosjar
82cf0e60fb Clang: Fix include paths for MSVC toolchains
Prevent libclang from using any builtin includes paths or any standard system
directories. The project manager provides us all the necessary information.

Task-number: QTCREATORBUG-15345
Change-Id: I70e2dafea8d049a9b7a32b24ce2d4ce3dac2cd3b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-18 15:11:42 +00:00
Lassi Hämäläinen
10e947f65f C++: Fix crashes with the pattern "enum class operator A"
Parser parsed the pattern as an enum declaration the name of
which is a conversion operator. Add check to disallow keywords
after enum-key (enum, enum class, enum struct).
Add tests tst_AST::enumDeclaration and
invalidEnumClassDeclaration.

Task-number: QTCREATORBUG-15341
Change-Id: Ia037f00184c1d7e5b0374f39331bb6748f8d90b1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-18 15:09:40 +00:00
Tobias Hunger
c62ad6c450 CustomWizard: Make sure to create wizards with unique ids only
* Warn when somebody tries to register the same id twice
* Make sure the user wizards override the global once so that
  this warning actually makes sense

Change-Id: I69624666960c8836e25fd34abeef67015c1363ad
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-18 13:31:45 +00:00
Tobias Hunger
e39b515cd2 GenericProject: Fix display of files in project directory
Having a folder "." in the project tree is ugly, so fix that.

Task-number: QTCREATORBUG-15344
Change-Id: I0817f609162dbc39f7bb4f98e6afe85169710fb7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-18 13:31:39 +00:00
Christian Kandeler
e072133aa4 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: Ida2b0359866ce4397a8a10338103d592b0037d4f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-18 12:37:31 +00:00
Orgad Shaneh
c37193f884 BareMetal: Fix cloning of GDB server providers
Change-Id: Ie063ce3ab2caf5cf2ee709236db891e22bb9cc8b
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-18 12:22:51 +00:00
Ulf Hermann
04fda7d0f5 QmlProfiler: Avoid unrestricted unions
It seems we cannot use them, yet.

Change-Id: Ie5b0fd7daffbdc46992fc040448058dbde4b7209
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-11-18 11:35:24 +00:00
Jochen Becher
53335c2fda ModelEditor: Apply some source code formatting rules
1. Reduce 2 or more empty lines to a single empty line
2. Remove duplicate access specifiers
3. Remove lots of single empty lines between member declarations
4. Remove braces around single lines
5. List base classes on same line as class declaration
6. Ensure opening brace of class declaration is on next line
7. Add comment to end of namespace block

Change-Id: I95e2efa3abea806683e0943d54d6f203ad4af0e4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-17 18:06:50 +00:00
Ulf Hermann
131c8027da QmlProfiler: Fix traceTime updates
If the trace time hasn't been set yet, decreaseStartTime and
increaseEndTime should still do something.

Change-Id: I626c0df66a5d7327708ada77c78546ad4aafc52b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 16:44:01 +00:00
Ulf Hermann
9f857880a7 QmlProfiler: Initialize the model progress numbers
Change-Id: I037d0146e20d5fe1681f455fbd5da9ac5e89184b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 16:03:31 +00:00
Ulf Hermann
8183d81c3e Add debug messages model
Change-Id: Ib62f1c6b2d1c28a3b4e06ee93cbc35d30074ce02
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 13:12:09 +00:00
Ulf Hermann
499ac6ba6f Adapt to changes in QmlEventData
Change-Id: I2d01bb8b6684c9a9e3b2c4146f2101c31c7b0fa1
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 13:06:49 +00:00
Ulf Hermann
f3902fffa2 Remove dead code
Change-Id: I57f2e5e4d8b4637039a53d10a5126610b895e4ec
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 13:06:37 +00:00
Ulf Hermann
b89d12c450 QmlProfiler: Include debug messages in trace
A separate model will show them in the timeline for better orientation.

Change-Id: I537bac82ddef6a8bcc64ae403731512f8edcc9db
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 13:06:33 +00:00
Ulf Hermann
35cedb2aee QmlProfiler: Allow string data in events
The restriction to put all strings in the type data is becoming a
burden to further enhancements. Also, introduce proper ctors for all
event structs.

Change-Id: I42d3bac96155ac1ac183a2b82785ce0396c5a932
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 13:06:29 +00:00
Marco Bubke
bcd93b594e Clang: Extract highlighting information
Prepare the move of the semantic highlighting to the clang back end. We
have it under tests too so it should be quite easy to make changes or
corrections.

Change-Id: I5706a8a06fde5a9ba2eba3a8ba62782102ac0bd3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-17 12:41:37 +00:00
Marco Bubke
611d7db4de Clang: Don't instantiate value two times
Change-Id: I5619f157a8a251ad06f6ea63d310015d13eb4c9c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-17 12:41:04 +00:00