Commit Graph

44349 Commits

Author SHA1 Message Date
Orgad Shaneh
46ba29b8c0 QmlDesigner: Minor cleanup
Change-Id: I8cb6d208a6864b9a1ba428bced6c3d65440c5fee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-29 10:50:07 +00:00
Eike Ziller
df94a96043 Fix build on Windows and macOS/Qbs
Task-number: QTCREATORBUG-18805
Change-Id: Ic178a2f8bf167a8e0c683e055b22211e52f18395
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-08-29 09:28:05 +00:00
Eike Ziller
664ab2c4c2 Reduce dependencies for sdktool to QtCore
Explicitly pull in the sources that are needed from utils, instead of
linking against the library.
Also generate another copy of app_version.h for sdktool, so
it is not necessary to run qmake on src/app/ before building sdktool.
For Qbs, it already depends on the separate app_version_header product.

Change-Id: I102c3a928f88a6035640166035c1bca29b126068
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-29 07:34:18 +00:00
Eike Ziller
b91064f386 Fix more copyright years in plugins
Change-Id: I44845b3cc6f393e76a2f3ff5f166c6170c4eff56
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2017-08-29 07:28:38 +00:00
Joerg Bornemann
d954c944fe Fix application output of qtestlib projects when debugging with CDB
Tell QTestLib to use OutputDebugString for logging when "Run in
Terminal" is turned off. This way we are able to distinguish CDB's
output from the debuggee's output.

Task-number: QTCREATORBUG-16161
Change-Id: Ie5e6e4a0cbb853167766f782521101eff2e1963a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-29 07:27:50 +00:00
Alessandro Portale
d374cd2d76 Valgrind: Add valgrind.qrc to valgrind.qbs
Change-Id: Ieb6855daf932297008a5bc498bc30a7ae0061178
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-08-28 18:13:34 +00:00
Marco Bubke
d2c6c30845 Sqlite: Add temporary option to SqliteTable
Change-Id: I9ccfc8febd95cbf8cb9c9d3ea45388e50df434d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-28 17:08:42 +00:00
Friedemann Kleint
2605108f68 FileName::exists(): Check for empty files first
Fixes warnings
"Empty filename passed to function"
(introduced by qtbase  0dee566e98f5ff4f224e596de1c04de4f9685df4)
emitted when running Qt Creator against 5.10.
The warnings originate from Kit::icon().

Change-Id: I501914195b8e4d340fd02362b215ffc6e3dc99d4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-28 15:04:41 +00:00
Orgad Shaneh
34c0b2c23d CompileOutput: Flush other parsers on make error detection
Fixes wrong linked lines when make terminates. The lines marked with ** are
linked instead of the lines marked with &&.

int main()
{
    boo;
}

main.cpp: In function 'int main()':
main.cpp:3:5: error: 'boo' was not declared in this scope
     boo;
     ^~~
&& main.cpp:3:5: note: suggested alternative: 'bool'
&&     boo;
&&     ^~~
&&**   bool
** mingw32-make[1]: *** [Makefile.Debug:98: debug/main.o] Error 1
** mingw32-make: *** [Makefile:34: debug] Error 2
** mingw32-make[1]: Leaving directory 'D:/Projects/test'

Change-Id: I33b87d5b20e1e5ee21319986086c832a4aa77e07
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-28 15:02:37 +00:00
Marco Bubke
1a25b61576 Sqlite: Improve Sqlite wrapper
It is now possible to read values at once.

for (auto [name, value] : statement.tupleValues<String, int>(1000, "foo", 20))
   ....

Change-Id: I3d4bc5218810b4620e1df625126aa490f30bbc71
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-28 14:50:33 +00:00
Christian Kandeler
e1d09e518d Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: Ibfca3fc66398ebd6f2f4d56d02510d5b471d088a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-08-28 13:56:31 +00:00
Marco Bubke
8617f497bc Utils: Cleanup StringCache
There is now a forward header and it is possible template the string type.

Change-Id: Ibebd32c475a2d89a90da7190e77d44278eb43740
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-28 13:47:26 +00:00
Marco Bubke
09206ba0e4 Utils: Add explicit conversion operator to QString to SmallStringView
Change-Id: I759651c6426337256b514055132806bf91e93e33
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-28 13:47:16 +00:00
Marco Bubke
1ac525bafe Utils: Add _sv literal for SmallStringView
You can now write "text"_sv to get SmallStringView

Change-Id: I4a5172c97b9bfb283360037ebb934c589ad5a2d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-28 13:47:07 +00:00
Marco Bubke
d417292b88 Utils: Cleanup SmallString IO
Change-Id: I59d0239e600f91304bf6e084d9e3550e423fc54e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-28 13:46:57 +00:00
Marco Bubke
381b51c012 Utils: Add toView to SmallString
Change-Id: I242a3a8e8411dfca19e50279928f97a5623e55d4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-28 13:46:48 +00:00
Marco Bubke
24e5dd0556 Utils: Add compare function for string views
It is more efficient to use compare instead of less and equal together.

Change-Id: I772b03ba02509c0ebc5d5d770be14cf7d5bd431e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-28 13:46:38 +00:00
Marco Bubke
d45cd9a35b Utils: Use C string functions
They are better optimized.

Change-Id: I6db1c94d283ee9f3f1555ce02b9b42d38003e2d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-28 13:46:28 +00:00
Eike Ziller
5cf580c1f3 macOS: Fix issue with saving settings (work around Qt bug)
When closing the application via Quit from the application's context
menu in the dock, Qt sends the closeEvent twice, leading to funny issues
(QTBUG-43344).
Remember if we already successfully went through the closeEvent, and
skip it in that case.

Task-number: QTCREATORBUG-18798
Change-Id: I8c54f0695b1af2572fa0ade7487a6a993022946b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-28 13:44:49 +00:00
Orgad Shaneh
410e78e4fd Fix save for relative symbolic links on Windows
Works around QTBUG-62802.

Change-Id: I2edacb6d368e28fa240e7a866692391cf67f0ca2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-08-28 11:20:14 +00:00
Orgad Shaneh
9a1030cfab CDB: Fix loading of user scripts
Change-Id: I20008227fd73b16978d63b50c4b9a38c0b590f09
Reviewed-by: hjk <hjk@qt.io>
2017-08-27 13:07:31 +00:00
Nikita Baryshnikov
42a5446b6c MiniProjectTargetSelector: fix division by zero
Change-Id: I618c92366424e924d13841a36c4393057e8d9aa4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-08-27 06:55:44 +00:00
Nikita Baryshnikov
d6d761d848 SshDeviceProcessPrivate: direct init fields
Change-Id: I2755ce51874ceceb3d9a3475ae1971366080f00d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-08-25 15:21:59 +00:00
Christian Kandeler
d2eb24af1d Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I35cb0bc521ad709f428b235f22ddc7d0265f3853
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-08-25 14:21:55 +00:00
Nikita Baryshnikov
91ad651851 ProjectExplorerPlugin: remove runConfiguration check
against null pointer

Change-Id: I91760f7aeaadf596ef759f56f8374dabab1dd8bf
Reviewed-by: hjk <hjk@qt.io>
2017-08-25 12:06:06 +00:00
hjk
23e46b2f06 WinRT: Use new setter based DebuggerRunTool interface
Change-Id: Icda75b686eeda23c4babd4dbbf32f04d01e2d255
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-08-25 11:08:16 +00:00
hjk
82ce3c885f Debugger: Extend new setter based interface
Needed for WinRT and BareMetal

Change-Id: Iad8b4c36df6f004f74cb66dbf730b2ca43a0e413
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-25 11:00:43 +00:00
Eike Ziller
dfb077b57c Fix build on macOS
If you use ostream you should include ostream

Change-Id: I50701eacd6f2a526d76283ba24303d3fb7a783bf
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-08-25 10:08:32 +00:00
Christian Stenger
ecd8fd1198 AutoTest: Ensure reparse even for unlisted Qml files
Files containing Quick tests are not necessarily listed
inside the project file.
If such an unlisted file is updated we have to scan for tests
even if it is not part of the project otherwise it would not
get updated inside the test tree.

Task-number: QTCREATORBUG-18692
Change-Id: I4c4c67d50b4fff13138b0ab3c884f5ea48a7b8bf
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-08-25 07:16:43 +00:00
Christian Stenger
60de0b7405 AutoTest: Do not blindly mark tree items for removal
If we want to mark test tree items because of their file name
explicitly for removal we must not mark its children
recursively without looking at their content. (Grand-)Children
might have a different file and won't get updated ('unmarked')
when just parsing single files which in turn would lead to
sweeping them after parsing.

Task-number: QTCREATORBUG-18689
Change-Id: Ic28dda5652899308a71d2bd3c28a7fde89a08a0e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-08-25 07:16:36 +00:00
hjk
503a73d527 AutoTest: Use new setter based DebuggerRunTool interface
Change-Id: I559bef1b088af9009247542730208d18b514b118
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-25 05:50:16 +00:00
Orgad Shaneh
f974fb4964 FileUtils: Recover deleted comment
It was deleted in 52ed384549. Not sure why.

Change-Id: Iccc1716e2fa994f649f5ac37f2288d1c6c44cb28
Reviewed-by: David Faure <david.faure@kdab.com>
2017-08-24 16:35:18 +00:00
hjk
d34f33d8d7 Valgrind: Extend and use new DebuggerRunTool interface
Change-Id: I5e015a484e67175be12d538e7f814d61001ad7bb
Reviewed-by: hjk <hjk@qt.io>
2017-08-24 16:21:23 +00:00
hjk
ce62181cb8 Debugger: Add a few convience setters for some run parameters
The idea is to use them later to make the DebugRunTool setup leaner.
As proof of concept, use the new interface in LinuxDeviceDebugSupport.

Change-Id: I045ba4d05cfc56a9e875fd4461e9f562153872dd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-08-24 15:21:27 +00:00
Marco Bubke
b725018e9e Clang: Cleanup interface hierarchy
The server and client interfaces was tightly coupled.So it prevented
the introduction of immediate interfaces.

Change-Id: Ie4197ffddb862e076d080b3d2a5ee869fad9e4d0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-08-24 13:28:47 +00:00
hjk
6c5146ac67 Valgrind: Better output message for debuggee exit codes
The values are not "unknown errors", but known to be exit codes of
the debuggee.

Change-Id: Icc5e99d463269f1f167ab7b49b78b92c2e4c6b65
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-08-24 12:58:37 +00:00
Nikolai Kosjar
f07bc467a3 Clang: Tests: Improve DocumentSuspenderResumer
* Use IsEmpty()
* Set up proper error printer

Change-Id: I9d4750f8e69e0660ece33015d439c796077d1727
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-08-24 12:52:10 +00:00
Eike Ziller
04da881268 Fix copyright year in plugin info, --version, and macOS info
By using the new QTCREATOR_COPYRIGHT_YEAR variable

Task-number: QTCREATORBUG-18612
Change-Id: I3bcf0319660d210436d3130c00f43325c460a66c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2017-08-24 11:23:40 +00:00
Eike Ziller
df796e2aa5 Merge remote-tracking branch 'origin/4.4'
Change-Id: Id525d68a899f2db14c2d52c200a3a2a8a4e81590
2017-08-24 13:23:04 +02:00
Nikolai Kosjar
1b89ccb859 CppEditor: Check for canceled future
Task-number: QTCREATORBUG-18793
Change-Id: I80a811814e5c7edc1e9b94ed0775abfc21723da2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-08-24 10:40:46 +00:00
Oliver Wolff
7b52aa2a11 ClangBackend: Fix compilation on MSVC
Change-Id: I30c1c3c6b8190f911856e64b03c85e946c53126e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-08-24 10:33:52 +00:00
hjk
45caf84cc9 ProjectExplorer: Fix parsing ports from netstat output on Windows
Handle IPv6, and do not try to interpret the result as hex.

Change-Id: I700c233d03cc706bc8712ab9fabee75d7f126df3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-24 09:53:00 +00:00
hjk
44d3a286e3 Android: Remove unused AndroidRunner::localGdbServerPort method
Change-Id: Ia941b7437c8bc7424b3b9176312256c8f15c0a24
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-08-24 09:18:22 +00:00
Orgad Shaneh
1f443bde52 Replace QFileInfo(fileName.toString()) with fileName.toFileInfo()
Change-Id: Iac7f866b4846939af4dcee086ab07797cc6b8ff1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-24 08:54:16 +00:00
Nikolai Kosjar
94747ea2d0 CppTools: Guard against invalid document
Change-Id: Ib6fcdc312fcfa558cd7e1e55c46cb84c002258ad
Reviewed-by: hjk <hjk@qt.io>
2017-08-24 07:00:39 +00:00
Orgad Shaneh
e59874f531 CompileOutput: Activate links only on left button click
Complements a7ffd67a91.

Change-Id: I3e70cf635774db3e126984dd70362aa0d3baa82a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-24 07:00:30 +00:00
Eike Ziller
119ff05ccc Help: Make restoring override cursor more robust
Some help backends are not too consistent in how they send started and
finished signals (QtWebEngine I'm looking at you), so make restoring the
override cursor more robust in the base. As long as the backend reports
that it is finished, guarantee that all previous override cursors are
restored.
Also ensure override cursors are restored in case the viewer is
destroyed.

Task-number: QTCREATORBUG-17758
Change-Id: Icb1cd1eabfb232135a391a550d8e6719a74189eb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2017-08-23 15:12:20 +00:00
Nikolai Kosjar
024cfda06c Clang: Ensure that an unparsed translation unit is not suspended
Currently this might happen when registerTranslationUnitsForEditor is
called with visible documents that are not the ones that are registered.

Change-Id: I9ae5f75c8bbff6a11161a3387633726066001062
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-08-23 14:54:45 +00:00
hjk
494769bad6 BareMetal: Allow omitting OpenOCD config files
There seem to be uses of that case.

Task-number: QTCREATORBUG-18784
Change-Id: I2f278eab87406a3549c57b5fa032e9f3a606e947
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-23 13:21:42 +00:00
Eike Ziller
ddd9e96afa Merge remote-tracking branch 'origin/4.4'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/libs/utils/utils-lib.pri
	src/plugins/clangcodemodel/clangbackendipcintegration.h
	src/shared/qbs

Change-Id: I240e89afc76d8f40ce69d66683014b603f714707
2017-08-23 12:12:41 +02:00