Commit Graph

43591 Commits

Author SHA1 Message Date
Tobias Hunger
dda9380052 Git: Simplify createRepositoryAction usages
Change-Id: I53047333e2591b9e2aca7931a1e809f99baf6f31
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 13:42:10 +00:00
Eike Ziller
109ce5663a Modeling: Fix merge issue
Change-Id: Id1a398fdaa68c3515f21908164c1b84616a8afc2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-23 13:31:57 +00:00
Eike Ziller
3f63635053 Merge remote-tracking branch 'origin/3.6'
Conflicts:
    src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
    src/plugins/git/gitplugin.cpp

Change-Id: I78a21510d484b655e01141a3543e08ee2123f9cd
2015-11-23 14:25:38 +01:00
Jake Petroules
499589096a Add missing include.
Change-Id: I3ccc9c96a4a4ebc974424cbee7289a8fa0fbc196
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 11:59:22 +00:00
Robert Loehning
114e52b3f0 Squish: Update video's title in tst_WELP04
Change-Id: Ibf9d75324332be4e3223323ed8aa4cc34b01612e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-23 11:41:29 +00:00
Marco Bubke
a2988a2800 Clang: Enable stack traces
Change-Id: Ia7b8b7aa598f74e2c80e27f328ac5ddb410c043e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-23 11:25:08 +00:00
Marco Bubke
8745c0a261 Clang: Activate clang crash recovery
Change-Id: I382a4d433ef64dedfeb39034df93579e7eb2580c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-23 11:25:00 +00:00
Tobias Hunger
22e3a7b3a4 Target: Make constructor private
Use Project::createTarget consistently

Change-Id: Ic8b60f35a830080d325758c93bca7068c9859c59
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-23 10:27:19 +00:00
Tobias Hunger
f133ca30e3 TargetSettingsPanel: Remove unnecessary method
Clean up the necessary one a little bit.

Change-Id: Iba62b507461297c669b96a549714c117d385b518
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-23 10:26:33 +00:00
Tobias Hunger
e404aa2ec9 Target: Make sure the kit pointer does not change
Change-Id: Id49519890cbc11a68a19a2072f45393bb00e2530
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-23 10:26:21 +00:00
Tobias Hunger
4a5ed881fa Target: Move clone code from TargetSetupWidget to Project
Change-Id: If30e5c18be48c647d490c054796d9ff7844bb1d6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-23 10:26:10 +00:00
Tobias Hunger
6a80b43e30 Git: Get rid of SLOTs for createProjectAction
Change-Id: Iee54656c54255912314ded0fa970e228b7e5d54c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 10:24:26 +00:00
Tobias Hunger
c3fdaa12e1 Git: Get rid of SLOTs for createFileAction
Change-Id: Idcdf20c6c9187103cfb6eb3172b3777f5dbe9876
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 09:47:16 +00:00
Martin Kampas
7081b7aecb PathChooser: Fix segfault on destruction
I was only able to crash it with the Mer plugin (not in tree).

Change-Id: Ie478f74c48ac6686418207fd1af8b727bcfed3cd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-23 09:07:55 +00:00
Tobias Hunger
6e9e8ebd14 Git: Simplify repository related action creation.
Change-Id: I4928e5424356f27af79999d39b2e2ea5a1440264
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 09:05:34 +00:00
Tobias Hunger
947e821743 Subversion: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I9ed81a33b27b85773218e943ba39c2ac5d88adf3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 09:01:51 +00:00
Tobias Hunger
a1c2a0fde4 GitPlugin: Remove dead code
Change-Id: I5841bf5a7ae8523874d3a2f15aa7044b41350845
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 09:01:40 +00:00
Tobias Hunger
125578a91a CVS: We still need some public slots:-/
Change-Id: I48ee8706d564b9d537b7117ba48f1d6b47a4a870
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 09:01:13 +00:00
Tobias Hunger
b10766e4de ClearCase: Use Qt5-style connects
The heavy lifting was handled by clazy.

Change-Id: Ic86f3d5b16cd60361e68b7915595056a68f5a9ba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 09:01:06 +00:00
Tobias Hunger
96bc63e0e7 CVS: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I8a36528605e5de791ece191e94a0911112b5a237
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 08:35:19 +00:00
Jochen Becher
3257691088 ModelEditor: break lines in source files
Change-Id: Ie8a01d146c062be75657fca2423734f3d2f7f296
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-21 16:28:34 +00:00
Leena Miettinen
708fda792e Doc: make umbrella topics consistent with browsing sequences
Some topics had ended up in the wrong top level topic,
as compared with the manual structure.

Change-Id: I03bc2fa2c0cbc8492c2bcec58eeddcd04d249a96
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-20 14:34:11 +00:00
Thomas Hartmann
927767c645 QmlDesigner: Fix crash
We removed support for non default properties in the navigator.
But the model still allows QML code like this:  toolBar: ToolBar {...}

In this case ToolBar is not visible in the navigator. But the ToolBar
is available/visible in the form editor. Reparenting anything to ToolBar did
crash. Eventually we have to re enable non default properties, but this
patch only fixes the crash.

Task-number: QTCREATORBUG-15111
Change-Id: Ifa037975c99762fb8067afffa118332044842d7f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-20 14:22:43 +00:00
Sergey Belyashov
02e387f5d8 Update Russian translation
Change-Id: I35f09b4905f325f712b9d506149412dfcbb51bb5
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-11-20 13:52:23 +00:00
Orgad Shaneh
aecfeb8758 Perforce: Complete Qt5 connects
Change-Id: Ifdcda2c529fc2b6c0313a6d0b521694d0ab32012
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 12:00:43 +00:00
Jake Petroules
141688092d Fix missing application icon in Qt Creator qmake build.
Task-number: QTCREATORBUG-15260
Change-Id: I60bb8c455e708d377828801377c4fee43e654dcb
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-20 11:57:26 +00:00
Ulf Hermann
3b48de66bf QmlProfiler: Don't open 2 error boxes when failing to connect
If we've parsed an error message from the application's stderr we can
stop trying to connect.

Change-Id: I8d58e5db19de3253681c52be1637cfddfd46a519
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-20 11:40:10 +00:00
Orgad Shaneh
a941f7b216 Mercurial: Fix "view" invoked from editor
The editor is initialized with a SLOT reference to view.

Change-Id: Ia793878f12c8caf8a71b565f78bf05db6bac74ca
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 11:25:26 +00:00
Orgad Shaneh
6c74ef237a Git: Avoid duplicate check for modified files
Change-Id: I05e09434944706a61cc079c30d37309eea5019f5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 11:24:16 +00:00
Martin Kampas
5077081319 Wizards: Fix inconsistent category display names
Change-Id: I24d0744351d0065793b8ccb65ba83d8a499f28dd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 11:22:45 +00:00
Martin Kampas
f00280d11d qtcanvas3dapplication wizard: Fix typo ${} -> %{}
Change-Id: I248a12ac502d66c331f4584c84ee8a1f1f4ac0a4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 11:21:39 +00:00
Leena Miettinen
50cbb30911 Doc: remove extra column from table on front page
Change-Id: I8ed573305d209f887a6e65623b5a40173493df73
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-20 11:12:56 +00:00
Orgad Shaneh
0275d34dd2 QmlDesigner: Fix GCC 5.2.1 warning in release build
warning: 't' may be used uninitialized in this function [-Wmaybe-uninitialized]

Change-Id: Ic9f87bdb8da36db5371349fb1987d2e9fe66665e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-20 10:18:34 +00:00
Orgad Shaneh
d5ff81e1c5 SSH: Fix GCC 5.2.1 warning in release build
warning: 'label' may be used uninitialized in this function

I know it doesn't make sense... :)

Change-Id: I954ea725f7437d4b31f836134bf59b10f9fbee01
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-11-20 09:08:58 +00:00
Orgad Shaneh
01b50d2fc3 Fix invalid long address printing
Task-number: QTCREATORBUG-15326
Change-Id: I90b73e757c0ad3fc16ef587e6b4359e6bcb843ea
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-20 07:51:14 +00:00
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