Commit Graph

47153 Commits

Author SHA1 Message Date
Oswald Buddenhagen 3ff007d573 don't detect readlink a-priori
it's pointless and causes an unnecessary delay.
what's worse, we wouldn't actually know whether we found a compatible
(gnu) readlink, so the fallback would never get activated. this would be
the case on macos (the problem wasn't noticed so far, because on macos
we build a bundle which doesn't need the wrapper in the first place).

Change-Id: Ibf4c370d5d9e25064e80faeaf12eb5fa1bc68c20
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-27 13:06:53 +00:00
Oswald Buddenhagen 5654828b22 fix hand-crafted symlink resolution
the base directory for making the symlink target absolute is of course
the dirname of the original file, not the target itself.

Change-Id: If5171ead8da0aa2afcaa8ccd6365771441440146
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-27 13:06:38 +00:00
Eike Ziller 75abb5e7c3 Merge remote-tracking branch 'origin/4.0' into 4.1
Change-Id: If651b6a5fddcdec5ce62a195448a30152a01fca6
2016-09-27 12:11:11 +02:00
Ulf Hermann 2689383fd3 QmlProfiler: Fix flame graph model test
The flame graph keeps separate "flames" for compile and other QML/JS
events now. The test has to be adapted to check for this.

Change-Id: Ifdbc3331240d30a3acbb9df62a6a44654466273e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-27 08:30:47 +00:00
Christian Stenger d1c8c5ded3 Squish: Disable gcc compile check on OSX
Change-Id: I6537bb9e20c9d16689cea520a01b28da8f2ed468
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-09-27 04:43:17 +00:00
David Schulz 91b3042cbe Macros: Check and reset currentMacro pointer after deletion
Task-number: QTCREATORBUG-16933
Change-Id: Ib55d5dd4b0478b655d6cb31f28c8ceb38159912f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-26 12:54:57 +00:00
hjk 47ede6dc42 Debugger: Fix expansion of items in tool tips
Task-number: QTCREATORBUG-16947
Change-Id: Id38b7dbf2773f04d2298a7dfee68fc0f280806e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-26 06:05:43 +00:00
David Faure c56b308ab5 Fix link error when llvm is in /usr but Qt isn't
LLVM_LIBDIR=/usr was making this code insert -Wl,-rpath,/usr/lib64
into the link line, which leads to link errors due to libQt5Qml.so being
picked up from there rather than from where the rest of my self-built Qt is.
(Qt5Qml is an indirect dependency of the other libs on the link line)

Change-Id: I76164905ede416ba2fb895fda372c08633777f4f
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-22 17:20:31 +00:00
Vikas Pachdha cf3afe885a iOS: Fixes a random crash in Qt creator while closing
The Qt creator crashed randomly while closing. Fixed the iostool process
termination

Task-number: QTCREATORBUG-14862
Change-Id: Ib356020095fe23f277389ebe30d8dedf4380ec28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-21 10:38:15 +00:00
Vikas Pachdha 1b7ea8437d iOS: Fixes false warnings about iOS kit and Qt version
iOS Qt version complains about missing compilers and the corresponding kit
complains about unsupported device

Task-number: QTCREATORBUG-16472
Change-Id: Ie2185e33ec5043de0230a325b48b21dc1a25109e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-21 08:25:34 +00:00
Orgad Shaneh ff963bc184 Git: Avoid QProcess::waitForReadyRead in MergeTool
It's unreliable on Windows with Qt 5.7.

Change-Id: I0703ae825e9db80ac8063d9f6962863a68591ed6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-20 13:23:35 +00:00
Orgad Shaneh c64b3f9882 Git: Do not rely on QProcess::readData/writeData in MergeTool
readData always returns 0 in Qt 5.7 (unless the process is not
running)...

Instead, write to the VCS output pane when reading from/writing to the
process.

Change-Id: Ie832d813d5a859b4ff5841fd2888783833c97945
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-20 13:23:30 +00:00
Vikas Pachdha 0c187a2b12 iOS: Fixes QML debugging on iOS device
Task-number: QTCREATORBUG-15812
Change-Id: I7c495457961bad89ba3a1ca6a19dcd018c4e3a5b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-20 09:52:59 +00:00
Leena Miettinen 177fce82a3 Doc: Update instructions for configuring iOS devices
Change-Id: Ie2323f373001da3ffa2591e2bc0a7b9187fa70ac
Task-number: QTCREATORBUG-16776
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2016-09-19 12:52:49 +00:00
Orgad Shaneh 714a9315aa ProjectExplorer: Fix infinite loop in mini target selector
Change-Id: I454c1b6eb3361b2e610782585152243163acfd58
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-19 07:37:30 +00:00
Orgad Shaneh 9ee955acb7 VCS: Only accept commit on Ctrl+Enter when enabled
Task-number: QTCREATORBUG-16808
Change-Id: I08442b027a6af300b2786e4510177bc050887ada
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-18 19:00:26 +00:00
Ulf Hermann 1ff9c71b65 QmlProfiler: Announce correct features from memory usage model
... and make the test pass again this way.

Change-Id: I0854688095af4385c4f57e113e3af03cca22e39f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2016-09-16 13:30:25 +00:00
Takumi ASAKI aaf073d874 Update Japanese translation
Change-Id: I87dcecabbcdc4c40aa48783152277bf758903f6a
Reviewed-by: Naoki Matsumoto <nekomatu@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-09-15 01:50:06 +00:00
Vikas Pachdha 1787d00e6e Continue process after lldb attach
lldb stops the process after attaching and the event loop is not yet started.
This makes the debugger wait for events while process is in stopped state

Task-number: QTCREATORBUG-15705
Change-Id: Iae6fe94fc483d963b377582c4cbbb443be5e6cba
Reviewed-by: hjk <hjk@qt.io>
2016-09-14 14:17:40 +00:00
Christian Stenger 95fa0e397b Debugger: Fix detection of lldb via xcrun
Change-Id: If91efbd1d7a3e01440a3ed5ee0172975c2b0eff1
Reviewed-by: hjk <hjk@qt.io>
2016-09-14 13:28:04 +00:00
Ulf Hermann 6b79bba985 QmlProfiler: Don't accept compile events in memory usage model
As compiling happens asynchronously it messes up the stack based
approach used to attribute memory usage to QML/JS events. Compiling
generally doesn't use the JavaScript heap, so we can ignore it here.

Change-Id: If8cc4b0ad2b8c2e0531260a8b92b7e2cd76a6d56
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2016-09-14 08:36:24 +00:00
Ulf Hermann 257d1990c6 QmlProfiler: Don't handle type IDs in memory usage model
Events in the memory usage model should not be selected when a type
ID is propagated from the statistics or flame graph model. The event
in the respective QML/JS model should rather be selected.

Change-Id: I6646358650f61c424c607e9dd8edb7fd9a61597e
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2016-09-14 08:35:17 +00:00
Ulf Hermann fbb45e5a57 QmlProfiler: Keep Compiling events separate in flame graph
The QML compiler can run asynchronously and produce ranges that don't
match up with other QML/JS ranges. The flame graph model assumes that
all ranges are perfectly nested, and produces incorrect data if they
aren't. The compile ranges are perfectly nested among themselves, and
the other QML/JS ranges are also perfectly nested among themselves, so
we can fix this by keeping separate stacks for them.

Change-Id: If4ea251c6a2e74bd04e142cf184937600ea31a87
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2016-09-14 08:34:47 +00:00
Ulf Hermann 0eb1301b5c QmlProfiler: Don't lie about the debug messages model's row count
The previous code would crash in the renderer if the type id is smaller
than the detail type of the message. That is rare, but can happen.

Change-Id: I7702284bc61a7c9227c7ad81ecf714255db5db9f
Reviewed-by: Michael Winkelmann <Michael.winkelmann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2016-09-14 08:04:44 +00:00
Eike Ziller 181a17bbdc Output pane: Fix that height setting could reset
When opening Qt Creator, and closing it without showing an output pane,
it would write a height of 0 into the settings.

Task-number: QTCREATORBUG-16829
Change-Id: Ia8ab0cea6620c4e654060f92f51bd5f0ce10e6b9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-12 13:53:04 +00:00
BogDan Vatra 5c34c678f5 Android: API-24 is not unknown anymore
Change-Id: Id0ce6b1fb289e356985d388f4843cffa24ddd77b
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-12 13:44:14 +00:00
Tobias Hunger e57f8e9038 GccToolChain: Redetect ABIs if the targetAbi is invalid
Fixes issues with broken ABIs in the settings, like you get when going
from QtCreator 4.2 to 4.1 and back.

Task-number: QTCREATORBUG-16823
Change-Id: Ibcab5d3bc8255dfeb647e512f5db1d94155f9d9a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-12 13:42:53 +00:00
Eike Ziller e4e30b24e0 Help: Fix online documentation path
When trying to open pages that should be in the installed documentation,
but are not, we try to open the page from the online documentation in
the external browser (e.g. for the links from Welcome mode). Looks like
the online documentation moved.

Change-Id: I7a8eaf37783661dc4751a12b65efeac419d3a802
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-12 09:10:03 +00:00
Ulf Hermann 0d5f5bdd6c QmlProfiler: Keep Compile and QML/JS statistics separate
The QML compiler can run asynchronously and produce ranges that don't
match up with other QML/JS ranges. The statistics model assumes that
all ranges are perfectly nested, and produces incorrect data if they
aren't. The compile ranges are perfectly nested among themselves, and
the other QML/JS ranges are also perfectly nested among themselves, so
we can fix this by keeping separate statistics for them.

Also, choose a less insane data structure for the relatives model.

Change-Id: I146593b67586e7b5aba6b19d360961c142511289
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2016-09-09 08:21:20 +00:00
Lorenz Haas bf8a1c07b1 Beautifier: Accept C and Objective-C files by default
Task-number: QTCREATORBUG-16806
Change-Id: I2f553fc82e9f0a192caaf4594227da3bb643b118
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-08 13:50:46 +00:00
Versus Void 5cd77137bc CppTools: Fix loading of .config files
.config file wasn't considered during creation of injected configuration
file thus disabling code processing inside #ifdef blocks.

Task-number: QTCREATORBUG-16236
Change-Id: I50f21622ec1b246aaa80e4832fd826f1b61d8e96
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-09-06 13:14:37 +00:00
Leena Miettinen f491ece833 Doc: Replace "Qt Build System" with "Qbs"
Change-Id: Ic9f17f16e5cfdf3aa02aa772772031876b7bcb77
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-09-06 09:09:14 +00:00
Christian Kandeler 76e85ab77a RemoteLinux: Try SIGTERM first when terminating processes
This was done for the "kill by process name" operation, but not for the
"kill by PID" one.

Change-Id: Ia8eb57d1fa030624470489dbd0e7b03093fd822b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-09-06 08:46:36 +00:00
David Schulz 9ce19c5dac Cdb: Fix QList child dumper
Task-number: QTCREATORBUG-16750
Change-Id: If67e2a55bb0a67957b10069675cdd0df7a18ad10
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-06 07:45:33 +00:00
David Schulz 5908d9aa14 Cdb: Fix sorting of reference node children
Task-number: QTCREATORBUG-16813
Change-Id: I640deb73c54a6f59ee5ff61e37ab487a05b05f27
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-06 07:32:27 +00:00
BogDan Vatra 258dc5d2e4 Fix debug on Android 6+ with NDK r11+
Task-number: QTCREATORBUG-16721
Change-Id: Ic65f13076794b75d6e4551b68d26fd3752f82098
Reviewed-by: hjk <hjk@qt.io>
2016-09-05 08:07:37 +00:00
BogDan Vatra 84b7e199ac Android: Fix package name search
Android 7.0 ps doesn't add \r anymore to the EOL.

Task-number: QTCREATORBUG-16782
Change-Id: Iff596ac2c1eafd0c5422cbac5708c8b616c73ecf
Reviewed-by: hjk <hjk@qt.io>
2016-09-05 08:05:23 +00:00
Konstantin Shtepa a3739fb14b Dark theme: fix selection color in help mode
Change selectedBackground color to color from flat-dark theme. Now
selected text in help mode is visible.

Task-number: QTCREATORBUG-16375
Change-Id: Ifed68617784f1303bc168e783e4a73bb9da55c8c
Reviewed-by: Konstantin Shtepa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-05 07:44:25 +00:00
Jarek Kobus 484c9853c0 Update Polish translations
Change-Id: I574d0790f27e31888c178223824fdc21171082c0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2016-09-05 07:37:53 +00:00
Robert Loehning b252733e63 Squish: Use examples and docs from Qt 5 in suite_WELP
Change-Id: Iddfa426e9c6133bd1f12ec8e119816c2d38ba55a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-05 06:46:25 +00:00
Robert Loehning 309be8277d Squish: Use example from Qt 5 in tst_rename_file
Change-Id: Ibf436af685897de730826927f746fc1de0c8f12e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-05 05:30:33 +00:00
Gabriel de Dietrich 8fecf8dc97 Welcome Screen: Improve link color in both dark themes
This is mostly tweaking the shades of green to provide
better constrast against the dark backgrounds. Since
the regular and flat dark themes have different back-
ground colors, the link color differ slightly as well.

Change-Id: I39b1aa82c89ff753513d203be696c64483812028
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-03 17:44:29 +00:00
Thomas Hartmann 4d999cc896 QmlDesigner: The strings for expressions have to be trimmed
Additional whitespaces iriitate the rewriter.

Change-Id: Idadba6947b3b44291f08988a2663ea9864e7eb44
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-02 10:07:33 +00:00
Thomas Hartmann 071439f8b7 QmlDesigner: Fix buttons in expression editor
We were using the wrong icons.

Change-Id: Idadba6947b3b44291f08977a2663ea9864e7eb33
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-02 10:07:22 +00:00
Thomas Hartmann 1df58005b5 Adding logging rule qtc.*.info=false to disable output by default
I also added the qtc prefix to all logging categories.

Task-number: QTCREATORBUG-16767
Change-Id: I04214dba9912fe6c669f10566582d6009b5d75f0
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-01 07:59:48 +00:00
Thomas Hartmann 99411324af QmlDesigner: Do not remove puppet stream if puppet crashes
Change-Id: I0374fbd9007cd8965b886e5f0a872434046e2bcd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-09-01 07:59:28 +00:00
David Schulz 89ff2c1db5 Editor: Collect indentation for a list of text blocks
Allows the indenter to reuse code formatter structures.

Task-number: QTCREATORBUG-16420
Change-Id: Ie906d7fdcb50798da02ef5b750fb03ae752aadc1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-08-31 05:33:56 +00:00
Christian Kandeler b97bc4016f qbs build: Fix more warnings on Windows
Change-Id: I2104d2889cff0fd6a2473e1e141936bb781041a9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-30 13:57:15 +00:00
hjk 9ae90a102b Debugger: Do not use remote working dir for local processes
Task-number: QTCREATORBUG-16211
Change-Id: I55866bfb64bffb601afcafceb45934ac50b1c686
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-30 10:48:17 +00:00
Robert Loehning 06ac9f00c0 Squish: Improve probabilty of dirseparator in generateRandomFilePath
With up to 43 characters it's more probable to
not have a dirseparator in the generated string.

Change-Id: Ib59fc55eb0b78c9796e19006c057571d7d494e40
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-30 09:41:46 +00:00