Commit Graph

44854 Commits

Author SHA1 Message Date
Christian Stenger
7d6aef484e ClearCase: Make updateStatusActions() a slot again
Change-Id: Iafbf78b16a09041bbabd248dfce4434df87dd5b9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-30 08:22:30 +00:00
Christian Stenger
e2097fe8ec Tests: Fix compile for OSX...
...as the define points to a path containing a whitespace which confuses
moc this must be escaped.

Change-Id: If5fe0e7b3eeb0f4a46df4df3eb8236c94587ea88
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2015-11-30 07:18:31 +00:00
Ulf Hermann
ff1e2150e4 QmlProfiler: Fix bogus disconnect() calls
Change-Id: I8caa5a2a45682e7472b9ebac9050c1a9a2a6f932
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-27 16:25:57 +00:00
Alessandro Portale
06946be255 PluginView: Refresh icons
HighDPI

Change-Id: If84b5f1642317d2cbc900cb1122f81e4790b0e39
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-27 14:56:09 +00:00
Christian Stenger
7eab6a53b1 Fix missing handling for xml tag
Without this we're running into the QTC_ASSERT within the default
case. ("unexpected cdatamode...")

Change-Id: I75b3b1ff08ff11064042cd2a877bcfe373b46e45
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-27 13:23:42 +00:00
Marco Bubke
a610c6740b Clang: Fix names for visibility changes in translation units
Change-Id: Iafee06b8f39610f4245ad86eec2b6d442acc61e2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-27 12:27:47 +00:00
Christian Stenger
ce2a891c48 Tests: Fix sdktool test
Change-Id: Idc21354d3f546c1aaff7d1481c80190c6c1c366c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-27 10:16:28 +00:00
Robert Loehning
f7ab95247b Bookmark: Remove unneeded includes of QDebug
Change-Id: I7c7a1d1b8fe94072255247721fd6f4f4b9ddb114
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-26 16:39:46 +00:00
Nikolai Kosjar
6cab8e6f4a Clang: Tests on MSVC2013: Disable warning 'unreferenced formal parameter'
Change-Id: Id3889a2529e5d816617806ade20323504e019384
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-26 15:34:34 +00:00
Marco Bubke
7ce9ef9db4 Clang: Integrate highlighting results from backend
Change-Id: I2c3fb69aabfe075bde76d63eafc2ca370f17493c
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-26 15:19:27 +00:00
Tobias Hunger
b0e7a0c869 GenericProject: Add ; after Q_UNUSED
Change-Id: Ia8710ed8830d15920a47fb132b916a2f0378607c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-26 15:13:51 +00:00
Nikolai Kosjar
eb2457869d Clang: Remove faulty copy constructor of HighlightingInformationsIterator
The test HighlightingInformations.ForFullTranslationUnitRange crashed on
Windows because of this.

Change-Id: I6dbf1e1ce127fedceccea92afe7c59c1d6a90db7
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-26 14:25:40 +00:00
Nikolai Kosjar
e244784ed3 Sqlite: Move export define to *.pro
...since we do not need that in e.g. unittest.pro.

Change-Id: I90da96e81eae3f0fdffd073c4314502c1e0d0c83
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-26 13:57:08 +00:00
Nikolai Kosjar
eaa93e8631 CppTools: Enable not exporting symbols
Having a dllexport in the sources for a TEMPLATE=app project (e.g.
unittest.pro) will create a library on Windows, which is not needed.

Change-Id: I0d454cdb7e3eb862200766ea101d41cef2758986
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-26 13:56:59 +00:00
Nikolai Kosjar
7874d61998 Clang: Enable not exporting symbols
Having a dllexport in the sources for a TEMPLATE=app project (e.g.
unittest.pro) will create a library on Windows, which is not needed.

Change-Id: I1ebdd8b5ada06965c3dd89074ac2bc6dff09299c
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-26 13:56:50 +00:00
Nikolai Kosjar
216f110385 Clang: Tests on MSVC2013: Fix file name clashes
The following files conflicted:

	src\tools\clangbackend\ipcsource\translationunit.cpp
	src\libs\3rdparty\cplusplus\TranslationUnit.cpp

	src\libs\3rdparty\cplusplus\Type.cpp
	src\tools\clangbackend\ipcsource\type.cpp

	src\libs\3rdparty\cplusplus\Symbol.cpp
    src\plugins\clangcodemodel\symbol.cpp

Change-Id: If7865570cd70e39e25cc8d508f771c8023288f0c
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-26 13:54:21 +00:00
Christian Kandeler
b2a04cdfef ProjectExplorer: Replace an occurrence of PathChooser::rawPathChanged.
As the associated slot uses PathChooser::path() rather than
PathChooser::rawPath() and should therefore react to the pathChanged()
signal instead.

Change-Id: I63ab0957923bce366d43e9788c56f9a9d16d2d29
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-26 13:38:06 +00:00
Christian Kandeler
ccd92d8c0b Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: I158c75917f285a2e902614d1750691bd231a5d16
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2015-11-26 13:33:35 +00:00
Nikolai Kosjar
6687b60a99 Clang: Tests on MSVC2013: Fix string literal concatenation
Change-Id: I1b1cefbace16cf0161bfe522d2ac37704e374713
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-26 13:17:32 +00:00
Nikolai Kosjar
3ed40074ff C++: Add missing includes
...that are needed for building unittest.pro.

Change-Id: I05a87febbb4a17752c4321b868f71cabf258e1dd
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-26 13:17:25 +00:00
Eike Ziller
9099a37d4b Fix merge issue
Change-Id: I414a72ba77ea5218711fb9a8b0d3d160670a93d2
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-11-26 12:22:04 +00:00
Eike Ziller
fa227a4eef Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/libs/qmldebug/qmldebugclient.cpp
	src/libs/qmldebug/qmldebugclient.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I9594b4e9befc78f8138deb121f0bfc4212f7edbf
2015-11-26 13:01:20 +01:00
Ulf Hermann
35ed93fe2d QmlProfiler: replace TCP connections after 200ms of failing to connect
Sometimes it takes very long to establish a TCP connection to the debug
server. If the connection hasn't been established after 200ms we
probably don't want to wait for it any longer. If, however, the TCP
connection is there and the "hello" hasn't arrived yet, we keep the
connection in order not to trigger an unexpected state in the
application.

Change-Id: I1a64493fefc759f526cdebff434a2557077f9246
Task-number: QTCREATORBUG-15383
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-26 11:40:51 +00:00
Ulf Hermann
e3c16259ed QmlProfiler: When showing connection error, cancel any connects
The device can exist without being open, which makes the disconnect()
when the message box finishes ineffective. Also, disconnect() merely
trashes the signals and slots, but doesn't remove the device.

Task-number: QTCREATORBUG-15383
Change-Id: I8eb8ca3db496c9841156c0949c3e3bfd92329056
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-26 10:36:55 +00:00
Tobias Hunger
08aebad607 Android: Allow for longer keystore alias names
This was limited to 8 characters, but I can't find any indication
that there is any reason for such a short limit.

Task-number: QTCREATORBUG-15397
Change-Id: I1d7eb3ec4403e66988b443199ce96ab89fc84c33
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2015-11-26 10:11:47 +00:00
Eike Ziller
f710ec8ce2 More change log
Change-Id: Ie8ee846e038ff926c4a0ff27dc4e7be61a05b2d6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-26 10:08:03 +00:00
Nikolai Kosjar
1f4af6a778 Utils: Specify LIBS in utils-lib.pri
...so that unittest.pro compiles on MSVC2013 without duplicating the LIBS line.

Change-Id: I2a4f9cab65620ea28692d17352e92ababc47e4fd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-26 09:16:32 +00:00
Alessandro Portale
495e1a2d24 Use the new Utils::Icon class and update some icons
Change-Id: Iff68d059e32507a688abe6f859f029d306b2b6a5
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-25 19:25:22 +00:00
Jochen Becher
275eb164f8 ModelEditor: Make destructor of interface virtual
Change-Id: I9da7caf155c1a8d53bfac63ff555e7f5dceb3787
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-25 16:45:28 +00:00
Jochen Becher
c9903acab2 ModelEditor: Use explicit constructors
Change-Id: Ifb951ea55e969eb2487ce501cb5fc6552c41cbd8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-25 16:45:14 +00:00
Christian Stenger
1c1e700916 Utils: Fix compile for Qt5.4 + gcc 4.7.3
Change-Id: I3490e9fab2cd7c6f0a4e88dcc97d7894ee4a14b1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-11-25 15:20:29 +00:00
Marco Bubke
8c3959534d Clang: Add current and visible editor message
Change-Id: Ifd88bc032388ae7a8d3dbc0f1f5746665074cc18
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-25 14:48:35 +00:00
Tobias Hunger
1ad0d015b9 Modeling: Hopefully unconfuse MSVC 2013 compiler
Change-Id: I5e98dc014a78ef23d325c5cfbf06027042c9aaa6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-25 14:25:30 +00:00
Marco Bubke
9310c02bc8 Clang: Add better diagnostic sending
We send first the current editor, next the visible editors and the end
everything else.

Change-Id: I4a7b5924ffe563d6a74251739ddedcd005ce046c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-25 14:23:44 +00:00
Marco Bubke
2e499b73d6 Clang: Filter scope operators
Scope operators are not really user defined.

Change-Id: I1ab08dc3db7c39b98da02b6ef10bf78b75a6856d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-25 14:18:42 +00:00
Marco Bubke
bd10e9b020 Clang: Only apply fixits to the corresponding revision
Change-Id: I4f4136369e1b261338d444670c212565e0c6b824
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-25 14:15:39 +00:00
Alessandro Portale
5b49a1b39b Use the new Utils::Icon class
Change-Id: I936a9cf3906ac23c529b3ee8ba80b4f11b476ada
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-25 14:13:06 +00:00
Tobias Hunger
adff3e1275 Fix build on Linux
Change-Id: I032bb4dda98d32f8d6e1ddac34dd9ac2e8e83cb5
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-11-25 14:12:02 +00:00
Christian Kandeler
f82297b91a Fix qbs build.
Change-Id: I9cdaa1545018a002a85d8f5cebb51883bfee204f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-25 14:09:37 +00:00
Alessandro Portale
033862f305 Themed Icons: Introduce Utils::Icon
Instead of describing icons via file name or in the themed icons case
via
a string that is a list of mask/color pairs, we have now a class for it.

Icons are now listed in per-plugin *icons.h headers.

RunControl::m_icon was The only place left where an icon property was in
fact a string. This patch changes that member to be a Utils::Icon.

Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-25 12:30:52 +00:00
Jochen Becher
00c75cd7eb ModelEditor: Remove useless abstract method declaration
Change-Id: I7dd421b45b36e7f4f4db6c3ab6ff5ae6e927309e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 16:58:27 +00:00
Jochen Becher
10164befcf ModelEditor: Add missing export qualifier
Change-Id: Ibb25139f3cbd892ba986712f7a96302c67de81f9
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 16:58:20 +00:00
Jochen Becher
c880ad1724 ModelEditor: Merge two if statements into one
Change-Id: I3535537a7a8e0f1ab1a618b3f255840340b1a182
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 16:58:10 +00:00
Jochen Becher
8ec154a7f9 ModelEditor: remove some commented-out code
Change-Id: Id34aa3131ba981115cef34e753e7ee8ff4eb440a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 16:57:54 +00:00
Jochen Becher
99bb159068 ModelEditor: Use data member initialization in private classes
Change-Id: I3004fcfc8663196c1ce1b1c49aeba60ce2753175
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 16:57:44 +00:00
Jochen Becher
5f31eee37c ModelEditor: Use override keyword
Change-Id: I258fd9e644db16a97fa2b667da38238d24841d90
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 16:44:12 +00:00
Jochen Becher
520829059a ModelEditor: Make destructor of interface virtual
Change-Id: I2da5766345116717c1c48aa71054473ff4e23a25
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 16:43:57 +00:00
Jochen Becher
864a6be91a ModelEditor: Add missing virtual destructor for base class
Change-Id: Ie3fce0a78bd83046e3a92a9463557317ba001153
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 16:43:44 +00:00
Jochen Becher
f0b6811b81 ModelEditor: Add forgotten methods for visitor pattern
Change-Id: Id96dcb5da1013e7997e914f96949ee1b01103469
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 16:43:23 +00:00
Tobias Hunger
13c5ea4d29 SelectableFilesModel: Fix filtering
Change-Id: If5633109c54c863eeb89cb740deb72c0a861af76
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-24 14:32:16 +00:00