Commit Graph

52238 Commits

Author SHA1 Message Date
Leena Miettinen
0bc2c807bd Doc: Update docs for the iOS code signing
Task-number: QTCREATORBUG-18785
Change-Id: Id3cb73236fc27ce8b23db55b1583474f68596619
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-09-01 07:11:32 +00:00
Christian Kandeler
28b0de8027 Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I4462e6e1c2089b602db01bcf073ed4d1ac5b29ca
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-09-01 07:02:07 +00:00
Robert Loehning
5f7636254a Squish: Store text of item as early as possible
It seems that item.text can change after (not during!) the
double-click. Storing it earlier to workaround this problem.

Change-Id: I5da4ae7ea8e19b945e56349c2236940a9e5731cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-01 05:04:19 +00:00
Claus Steuer
4e4118dd26 AutoTest: Add location info to all GTest results
Currently location information are only set for failed gtest results.
One can't jump to the location of a successful test by doing a double
click on the corresponding entry in the test result pane.

Use the TestTreeModel to obtain the location information for successful
tests in the GTestOutputReader.

Change-Id: I3fad2d0540edb653ff186011cb92db220748b4f5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-01 05:02:38 +00:00
Eike Ziller
285f054d74 Locator: Don't ask disabled filters for results
If they are disabled, behave is if they didn't exist (when looking for
matches). This was no issue with our own filters so far, because these
(by accident) also don't have anything to return if they are disabled.

Change-Id: Ia5fe85039631c41f7488d78d9f54b6322dc72b32
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-31 13:42:01 +00:00
Thomas Hartmann
be4cfb5f16 QmlDesigner: Adjust margings for "move zone"
I introduced a zone around the boarder of each item where
it can always be dragged,
instead of selection another overlapping item.
The area is now a lot smaller, but the 4px seem enough for me
when testing it.
This zone is slightly to big. I keep the size of 20px at the top
so the label/gizmo is always dragable.

Change-Id: Ia1b8afb822b506f5322b952d5537eafc73b52ea2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-31 13:36:16 +00:00
Tobias Hunger
5f9c7c8986 Resources: List .qrc files in project
List .qrc files (and the files contained) in the project.

Task-number: QTCREATORBUG-18790
Change-Id: If23ffd42900d67bcc8d8c9d2ecfb0e82daf8c986
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-31 13:09:59 +00:00
Marco Bubke
e8a6c7e9c5 Clang: Add placeholder text to Clang Query
Task-number: QTCREATORBUG-18815
Change-Id: Ie5d53f0b3f2464408bb09022483a3a6258e8173d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-31 11:36:26 +00:00
Christian Kandeler
436b0c86f5 sdktool: Fix qbs build on macOS
Change-Id: Ia84f814b653b1b07c20d02c724a1951914c1e0b5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-31 11:32:43 +00:00
Thomas Hartmann
feb05b9353 QmlDesigner: Allow WebEngine import
Change-Id: I26b6416bcfc00e9c04bbbb20ccb7d54f9fb298a5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-31 09:07:56 +00:00
Thomas Hartmann
c48b5f4ae0 QmlDesigner: Switch tooltips in the navigator
During refactoring the tooltips have been switched.

Task-number: QTCREATORBUG-18667
Change-Id: Iaacb333deebff46b0858ffff9dbd8f30954c7db8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-31 09:07:31 +00:00
hjk
e404ba9de1 PortGatherer: Add test for Mac's netstat output.
Change-Id: I6df357502e5621e858a848c567fe1590762d5fc1
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-30 12:56:11 +00:00
BogDan Vatra
2ebd51fca3 Android: Search for gradle template in QT_DIR/src/3rdparty/gradle
Qt 5.6.3 LTS adds gradle template but QtCreator failed to use it
because it compares Qt versions instead to search for gradle templates
in QT_DIR/src/3rdparty/gradle

Task-number: QTCREATORBUG-18811
Change-Id: I97c817f143a1d76fe4e2544b138cad9f4914eeee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-08-30 12:36:43 +00:00
Robert Loehning
ba1036fd46 Squish: Fix searching for filename in windowTitle
Currently, only the end of a filename as actually
compared since the title also contains "filename.h"
when the title starts with "otherfilename.h"

Change-Id: I60dd4dc1fd7c53fee2ddbc44953bcfe4d75c7530
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-30 12:27:37 +00:00
Filipe Azevedo
69b75895fa Implement port gatherer on macOS
Change-Id: I054612716872cdb90f2a3fb5d31c20e19962ebaf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-08-30 12:24:50 +00:00
Marco Bubke
3dd1d11f6e Clang: Fix path for clang query
Task-number: QTCREATORBUG-18814
Change-Id: I638fa4dd993e8efbabefc883622e1619b4e5d9cc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-30 11:01:18 +00:00
Christian Kandeler
e9e3a7d5e3 sdktool: Fix qbs build
Change-Id: If024aed2ddf06236284881a51df6af4b96585dfa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-30 08:05:34 +00:00
Orgad Shaneh
6467fe28ce ProjectExplorer: Parse another type of undefined reference error
obj/gtest-clang-printing.o:gtest-clang-printing.cpp:llvm::VerifyDisableABIBreakingChecks: error: undefined reference to 'llvm::DisableABIBreakingChecks'

Change-Id: Ifca2670c088962f6b60b6de522eb9e19e472bdb4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-30 08:00:42 +00:00
Tim Jenssen
a5625f2f9d QmlDesigner: initialize actions only at show
Change-Id: Iff6438daf70840116f02fcc439a6327c9401c32c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-08-29 16:35:16 +00:00
Christian Stenger
9fde45fb52 Squish: Add possible error and respective handling
When using pastebin there can be various errors. Add another
one and try to handle it gracefully as this is a server side error
we cannot influence ourselves.

Change-Id: I2bcd5b7752bfbb98e2b3fd41cc8ebb9daf0ebf32
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-08-29 13:52:18 +00:00
Vikas Pachdha
2e821a7730 Android: Fix default JDK path discovery
Task-number: QTCREATORBUG-18691
Change-Id: Ibd17e7edf1c2cfdcc54ff2b9f16a9125bb217a84
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-08-29 13:27:55 +00:00
Eike Ziller
b6c1cb3487 Bump minimum Qt version to 5.6.2
Starting to use macos qmake scope. 5.6.3 should be around soon so
we can still regression test latest two patch levels.

Change-Id: I14f67a26e26c50f6dd0fb8b621f13780b0b05f76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-29 11:23:15 +00:00
Eike Ziller
354e5e75a3 AutoTest auto tests: Fix license header
Change-Id: Iee053367d5548af65c3f8e36e65377e7b8b0dd07
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-29 11:22:24 +00:00
Leena Miettinen
5ca7894ee4 Doc: Explain different usages of "Restrict to MIME types"
Different MIME type restrictions can be specified for auto
formatting and executing the menu command.

Update the screenshot that shows Beautifier options.

Change-Id: Ie6028bef252c6b13d87c6c4eed465eddae991408
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-29 10:26:05 +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
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
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
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
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
Eike Ziller
f39d66973e More change log
Change-Id: I792eb013691f203e8da98dc51b2184af5cd26f63
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-08-25 12:47:41 +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
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
Christian Kandeler
70b37058b8 qbs build: Support new variable QTCREATOR_COPYRIGHT_YEAR
Change-Id: I2b5ca4f93456857b0c4ac8b7960982b28f5f0761
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-24 13:10:24 +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
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
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
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