Commit Graph

43591 Commits

Author SHA1 Message Date
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
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
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
Tobias Hunger
3a2d5954f9 SelectableFilesWidget: Wire up logic to notify about selection changes
Change-Id: Iba9b31c9ba374855c024d4fb0739d3ba9ab43bc9
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-24 14:32:12 +00:00
Tobias Hunger
8345ba2d2d Android: Set JDK path for builds
Without it the build may fail.

Task-number: QTCREATORBUG-15382
Change-Id: Ie7f823746516d17e8e32a367953cf491378f00c1
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
v3.6.0-rc1
2015-11-24 12:59:51 +00:00
Thomas Hartmann
bdf66b0a3f QmlDesigner: Adding specifics for GridLayout
Task-number: QTCREATORBUG-14821
Change-Id: Ifa037975c99762fb8866ffffa118332044842dff
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-24 12:30:04 +00:00
Ulf Hermann
983473163f iostool: Allow sequential client connections
The QML debug server allows this and QtCreator uses it, so iostool
should support it, too.

Change-Id: I71d4143457d427795e5abcbef0ad5d26378d5e9d
Task-number: QTCREATORBUG-15383
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-24 11:43:58 +00:00
Tobias Hunger
03a7b7d7a9 SelectableFiles: Introduce a common widget
Introduce a SelectableFilesWidget and use it in the FileSelectionWizardPage
as well as in the two FileSelectionDialogs we have.

Change-Id: I56acaa7a9776ac2c0c16c548e95794a662b9cd27
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-24 11:38:53 +00:00
Jochen Becher
70e0286f94 ModelEditor: Use auto keyword
Change-Id: I3d36f851227f6f90ddfc7da55169c6a8d4d57c39
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-23 18:21:27 +00:00
Jochen Becher
bf4b16ed5f ModelEditor: Use Qt5-style connects
Change-Id: I35f284fd790713670ce31d4a802860b4d41c1ad3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-23 18:19:27 +00:00
Eike Ziller
79c27ec6f1 Avoid running qmake by using unsortedVersions
Use unsortedVersions() instead of versions() where possible, since
versions() sorts by version numbers, and therefore needs "qmake -query"
to have run.

Change-Id: I76a05f1647d2baacbd33829c6b3bf719a1c8dcbb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-23 14:48:55 +00:00
Tobias Hunger
7b3aa16dc6 Git: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I60dcd378419b92f96dc681921701c9231ef8ee57
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 14:48:09 +00:00
Nikolai Kosjar
609bc2a389 Clang: Avoid needless reparse after first parse
Change-Id: Ie97818f29d1df61380cd1c22ef2598091050b10d
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-23 14:22:39 +00:00
Nikolai Kosjar
6deaf6b23d CppTools: Guard against doubled header paths
Change-Id: If183b6d2210028f74dae839db782114ce79911c4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-23 14:22:24 +00:00
Nikolai Kosjar
c88d18c310 Clang: Print command line arguments quoted
Change-Id: I82d664f259040b0024d9e1d4df4235442bc6ac73
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-23 14:22:15 +00:00
Tobias Hunger
8f8c1052a2 Git: Simplify action creation methods
* Use a common method to do the basic setup for all the different
  actions.

Change-Id: I92e1d959c45e70c8145b7665dde8827edaf2331d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 13:42:32 +00:00
Tobias Hunger
a01a8e7452 Git: Simplify createChangeRelatedRepositoryAction
Change-Id: I0d374b071b73565bb3e48b4a1f32bc7baf988a28
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-11-23 13:42:18 +00:00