Commit Graph

44349 Commits

Author SHA1 Message Date
Marco Bubke
66c8b86ff4 Clang: Inline FileContainer
Change-Id: Id27d0369c7e67fd4aa61b6d908b6cc7a8ee1de75
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-19 13:50:43 +00:00
Marco Bubke
32d8e4a74f Clang: Inline RegisterTranslationUnitForEditorMessage
Change-Id: I07b28a757dfc019a46617433491756385d646d96
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-19 13:50:36 +00:00
Marco Bubke
73c12e7ebc Clang: Inline EchoMessage
Change-Id: I59821d4b901ef23bb8127c52601dded9c5346544
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-19 13:50:22 +00:00
Marco Bubke
3177bbe01c Clang: Inline AliveMessage
Change-Id: Ibe10ff1324bc83d7cc8ddd6ad69bef077d3f1ec8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-19 13:50:13 +00:00
Marco Bubke
df1a197aee Clang: Inline EndMessage
Change-Id: Id24d5f786e5f47798c2d1a8e46081dfcd7f67913
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-19 13:50:05 +00:00
Marco Bubke
48bb527607 Clang: Silence warning
Change-Id: I2b3cdc22678b5454fbd831ad41b7186461289441
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-19 13:38:01 +00:00
Christian Kandeler
6d4b944683 QbsProjectManager: Fix crash at project closing
The QbsProjectParser was mistakenly made the parent object of the qbs
build job.

Task-number: QTCREATORBUG-16273
Change-Id: I8e0f9736ac9d92c5c1fe3d82430532358b78fee4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-19 13:23:51 +00:00
Leena Miettinen
6a52c34055 Beautifier: Use book style capitalization for headings
Also for group box titles.

Change-Id: Ia651d0c486e3aea9a305b4f6d55ff01b5c97cfc3
Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-07-19 12:26:51 +00:00
Serhii Moroz
7ce437a026 Todo: Fix crash after user discards open very big file dialog
Change-Id: I25cea3d4926ccb4a067c0e7e8a0725ad942b8e85
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-19 12:16:35 +00:00
Tobias Hunger
55d5f1ed01 Kits: Keep 4.1 toolchain information around
This stops creator from breaking settings when switching between the 4.1 and
the master branch.

Change-Id: I58a9b588368e2bd2a235503a5ca204d48ea5cead
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-19 11:48:50 +00:00
hjk
6edfb66908 TextEditor: Enable tooltips for textmarks
Adjust bookmark code, add tooltips for clang diagnostics.

Change-Id: I489d499f5431fcb29f27611d4350298acb30baac
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-19 10:45:23 +00:00
Nikolai Kosjar
36e12b75e0 ClangStaticAnalyzer: Warn about unsupported version
Change-Id: I4d8471b7d49c8f295d37add5a0c5b8a698e0f9d4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-19 10:38:31 +00:00
Vikas Pachdha
316ad743fa Signal to notify gradle selection
Change-Id: Ie9db0ca4b4133e63f06cda8fe9f3be8080eeaae9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-19 10:09:47 +00:00
Ulf Hermann
cf19a6af07 QmlProfiler: Remove unused member
Change-Id: I856ba25dcdbfc5a90a8d7fe1420257a4792e01ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-19 09:56:27 +00:00
Ulf Hermann
11af2f487f QmlProfiler: Fix some misspellings of "Flame Graph"
Change-Id: I281b327eeb53d1159b165f72abee7ebe442a68ff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-19 09:55:29 +00:00
Vikas Pachdha
e5835bb885 Minor refactoring. Helper method to check ios support
Change-Id: I93045bc5ae9732720239690a16bc81689d0663e5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-19 09:52:54 +00:00
Thomas Hartmann
392693352c QmlDesigner: Do not add slot by default for root node
Task-number: QTCREATORBUG-16476
Change-Id: Ibbf07f9a532c4594a87427b3516485a668a65d38
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-19 08:59:58 +00:00
Thomas Hartmann
b6279856ac QmlDesigner: Reseting models if id is changed
The change of an id was not taken into account.

Task-number: QTRD-2182
Change-Id: I8897fdf00d7d741fb26d30e3b71737809b51b4b4
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-19 08:59:53 +00:00
Alessandro Portale
e467827d04 App: Fix application font loading
QDir::entryList just returns file names as strings. In order to get the
full absolute paths of the font files, we need QFileInfos instead, which
dir.entryInfoList returns.

Change-Id: Ied0fb74afa4d02723d172f06d998a6916d5b0c9a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-19 08:52:59 +00:00
Nikolai Kosjar
62fe8fcef0 Clang: Clarify when clang code model is enabled
Change-Id: I07cf53641ea4f9ddb7ca7a67977b1ad7d43c5bad
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-19 07:26:16 +00:00
hjk
14ccac60b9 Debugger: Add a note to the debugger log about expected contents
Change-Id: I22402d07d23cb8bcfe24e80bb73a2aeaf33c5bed
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-19 06:00:35 +00:00
hjk
901ad4693d Debugger: Fix stack frame switching by mouse
Regression introduced by 2d79bdc2.

Change-Id: Ib5befb9c0730c9c2b46891139a9b15154300eced
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-19 05:59:24 +00:00
Thiago Macieira
cdf1c924a3 Git: make git grep not duplicate leading path names
Make sure we pass --no-full-name to counter the grep.fullname=true
option that the user may have set. Otherwise, Creator will complain that
it can't find the files that matched the search terms if the search
directory was not the root of the Git repository.

Change-Id: I149e0540c00745fe8119fffd14628a3d7887e55e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-19 05:23:08 +00:00
Marco Bubke
6e4da842ef Clang: Fix call of already destroyed virtual table
Task-number: QTCREATORBUG-16597
Change-Id: Ic5391ba7529de5b5ef5de260f4a5e831003ffbf6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-18 16:33:31 +00:00
Marco Bubke
19d941d28d Sqlite: Inline Utf8String
Actually you should use Utils::SmallString for new code because the
biggest overhead of Utf8String is the allocation on the heap and the
atomics.

Change-Id: Ic3d072ba47cb2a49ae3d7d158c6a58feb4b82769
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-18 16:28:27 +00:00
Thomas Hartmann
c0da4e7d80 QmlDesigner: Use QTC_ASSERT instead of Q_ASSERT
This assert is not critical and just indicates
an unnormalised file path.

Change-Id: I3ed7dbe8daae034e5faf44f1bc5aee7ba30e44d0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-18 14:58:44 +00:00
Alessandro Portale
00a9919646 Core: Lazier loading of OutputPaneManageButton images
Only load button state images when needed.
And not at all with the flat themes.

Change-Id: I2e150eaabab5c91a7230d911bf51cde47b390b04
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-18 14:37:55 +00:00
Aaron Barany
80b229a7ab CMakeKitInformation: Separate C and C++ compilers
Task-number: QTCREATORBUG-16501
Change-Id: I25a40afc39ad80deae6d1708816a2a9e527e9ece
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-18 13:18:52 +00:00
Nikolai Kosjar
8f9c42c640 Clang: Merge highlighting/diagnostics messages
The messages

    RequestDiagnosticsMessage
    RequestHighlightingMessage

and

    DiagnosticsChangedMessage
    HighlightingChangedMessage

are always send/received together, so merge them into

    RequestDocumentAnnotationsMessage
    DocumentAnnotationsChangedMessage

Change-Id: I6a0b6281ed1e6efe6cb18386afe99b1d1fb58abf
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-18 13:17:27 +00:00
Orgad Shaneh
3be096f152 Utils: Support default value substitution in macro expansion
Syntax is similar to bash substitution:

%{variable:-default}

Change-Id: I50e4e18a186c5408dc8b7b95cebbf891d13e03bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: hjk <hjk@qt.io>
2016-07-18 13:15:58 +00:00
Thomas Hartmann
d0c73211b7 Adding Source Code Pro font and loading it on startup
This makes Source Code Pro available on all platforms.
This font is designed specifically for code editing designed by
Paul Hunt.

See: https://github.com/adobe-fonts/source-code-pro

Change-Id: I7c5a875bd5fc09b02049706f1d61f3667c10d967
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-18 13:15:19 +00:00
Thomas Hartmann
d05437007f QmlDesigner: Remove unused variable
Change-Id: Iff3172d20afe6c397a9d0112f8e5812c51e4d5e6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-18 13:13:32 +00:00
hjk
eece696da3 Debugger: Remove multiple definitions of WatchWindow
Change-Id: If8241717f195ff31c9d6124285f77fca969056c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-18 13:07:35 +00:00
Tobias Hunger
c37c297690 Fix display of option pages
Improve handling of page sizes, especially of the kits page (with
small and big dialog sizes).

Change-Id: I8dba7b4b5028cb41e0719a2f9aec15eb89858a8a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-18 12:57:16 +00:00
Tobias Hunger
94b7c72a8c CMake: Make the editor for cmake varibales in the kit options page wider
Change-Id: I88ed1a915c69af9b4f351a5ef28aff807de2611c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-18 12:57:11 +00:00
Tobias Hunger
8df7935f4b KitOptionsPage: Some polish
Change-Id: I62595c701963415619fe763bbb5d52acb5fb4555
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-18 12:44:45 +00:00
Christian Kandeler
073e2e3b2e Update qbs submodule
To HEAD of 1.6 branch.

Change-Id: I65fd502f1fc1238165f9c3b232f7bb1fe9dffb5a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-18 12:34:57 +00:00
Thomas Hartmann
881f4e605b QmlDesigner: Fix styling
We removed the images and broke the styling.
This patch removes most of the .css styling and uses the fusion
style instead.

Change-Id: Ib16a2cdbb4f63ec43065c91d6f37183044618139
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-18 12:19:05 +00:00
Ulf Hermann
f8957a85b3 QmlProfiler: Remove dependency on ssh
QmlProfiler does not depend on ssh.

Change-Id: I603b673a27fd4fa47246a71ae1f394d11f51a8b0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-18 12:13:09 +00:00
Tobias Hunger
ad2b968e4c ShellCommand: Fix crash with OutputProxy use
Pass a shared pointer into runSynchronous and runFullySynchronous.
That way the proxy will stay around for as long as needed.

Task-number: QTCREATORBUG-16612
Change-Id: Ic529440c81d85149abd67e5eeb564cc5f12181ab
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-18 12:06:12 +00:00
Tobias Hunger
6f3bf106b5 Make git clone output nicer
Do pass on the character that caused the line split in the signal from
SynchronousProcess. That way the UI can handle '\r' properly, leading
to a nicer git output.

Task-number: QTCREATORBUG-16611
Change-Id: I1d73ec9061689267dfffd776f32ab9c10108d10e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-18 12:05:43 +00:00
Tobias Hunger
f3a23813fd CMake: Use eliding label instead of manually eliding text
This fixes the kit options page becoming wider in some cases as the
eliding was apparently off.

Change-Id: Ia682b75a2441d8d265b7c5a3c9943e36f33167db
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-18 12:05:14 +00:00
Ulf Hermann
ba9825625d QmlDebug: Decouple log messages from connection failures
A socket error is not the only possible reason for a connection failure
and exposing socket error codes to the upper layers is unnecessary.

Change-Id: I27e9f21160ecea5b0d811b83b7ab0ab9071cacff
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-18 12:01:12 +00:00
Ulf Hermann
60bc2ccc95 QmlDebug: Add socketState and flush() for local sockets
Change-Id: Ieb90f661eaa2a595c88e1e36653437c810a6aa3a
Reviewed-by: hjk <hjk@qt.io>
2016-07-18 11:55:12 +00:00
hjk
2d79bdc29c Debugger: Remove some uses of semi-global currentEngine()
Make use of recent TreeModel improvements in various
tool views, push more operations into the engine-
owned data models, specifically context menu creation.

Change-Id: I479c97102b9fb81611c6461c6df1cec59295179a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-07-18 11:17:53 +00:00
Orgad Shaneh
6bf0c3b6be ScreenShotCropper: Fix build + use Qt5-style connects
Do not include by default in tools though.

Change-Id: I83f6ae7467355ab00401df52e875e2aa6a6d5b39
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-18 09:33:12 +00:00
Tobias Hunger
84f1466b01 Use FileChangeBlocker
Use FileChangeBlocker over expecting/unexpecting file changes manually.

Change-Id: I8428841f966d81be477260416c75e91dee795425
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-18 09:07:23 +00:00
Orgad Shaneh
6567db9c5b Git: Delete unused cloneRepository function
It is now implemented by the wizard, using
GitVersionControl::createInitialCheckoutCommand.

Change-Id: Ie847402cf1bc22444d2142baa57bfac6a136fb8f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-18 07:37:46 +00:00
Christian Stenger
b7021f83f3 Fix compile with Qt5.5 on OSX
Broke with 05b5b61673

Change-Id: I60c9c243ad858563e793663bb0ce2ffc960c7868
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-18 07:11:04 +00:00
Orgad Shaneh
c125fbbe97 Git: Refix filtering of obsolete branches when adding a branch
It was fixed in 62c60c6d1c but broke again
by 04eb012267.

Task-number: QTCREATORBUG-16264
Change-Id: I1130d5c2eda3320714913570441499be0d55c8fe
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-07-17 18:12:21 +00:00