Commit Graph

44349 Commits

Author SHA1 Message Date
Ulf Hermann
7966c02369 Move category_* icons back to coreplugin
They are not used in utilsicons.h, but in other places.

Change-Id: I090c6397fefdc4302345da0544fb2482113a9246
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-10 16:02:47 +00:00
Nikita Baryshnikov
1e8e4b808f ModelEditor: fix icon path
Change-Id: I5d8c7ca4486e444a4c1c2861301e5a32c38a4068
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-10 15:36:57 +00:00
Ulf Hermann
d918e53394 Utils: Remove duplicate namespace specifier
Change-Id: I908fcfbe473ccf593c4488c932dbc7ff5688b7ef
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-10 15:01:09 +00:00
Ulf Hermann
bfe8d5c224 QmlProfiler: Don't use QML_MIN_LEVEL in statistics model
It is meant for the timeline and it makes no sense to start counting
at 1 when aggregating the statistics.

Change-Id: I0faa198da7a6b3316d5c989362247d5e7f3b45ce
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-10 14:35:50 +00:00
Ulf Hermann
edbd72f0a4 QmlProfiler: Remove unused constant
Change-Id: I1000adaa8b6f5637fd9d5964f7f73a981427c1a0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-10 14:35:38 +00:00
Marco Bubke
cf6b5dd5ef Clang: Remove unused variable
Change-Id: Ib59fa1cba5ada10338fb10c49e7314047cd474f8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-10 14:13:01 +00:00
Marco Bubke
6d577f5520 Clang: Remove useless semicolon
Change-Id: Idc030832a73caca3f5c4a234abf082ad6bfc86d7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-10 14:12:50 +00:00
Eike Ziller
bcbda07b7f Welcome: Fix shortcuts in tool tips
They need to show the native shortcuts, not portable

Change-Id: I5fbc1704c4908596aaf9cdbecf056a50e33f8fe6
Reviewed-by: Serhii Moroz <frost.asm@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-10 13:20:11 +00:00
Andre Hartmann
fc75b96dca BaseHoverHandler: Remove virtual and add override to derivations
Change-Id: I2bd3fd4774d7ffeb54c373309c98aa879a391227
Reviewed-by: Marc Reilly <marc.reilly@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-08-10 11:04:18 +00:00
Orgad Shaneh
6afcf33f7a TextEditor: Remove use of deprecated additionalFormats
Replace with formats

Change-Id: I9a24c0ad138c378aed1c49a15b80b7f64edabe30
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-08-10 06:12:10 +00:00
Orgad Shaneh
5bc8d10baa Remove uses of deprecated QProcess::error signal
This overload of error is deprecated in 5.6.

Replace with errorOccurred, which was introduced in 5.6.

Change-Id: Iccfba7e7103b7ce377471696f1f2ec217e52c840
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-09 16:02:43 +00:00
Orgad Shaneh
b17b2461dd Simplify Utils::sort calls that sort by member
Change-Id: I0937e98014f223f42fbf1c6b2bd94fb109bc8870
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-09 13:52:47 +00:00
Orgad Shaneh
670e54345c Remove use of deprecated Qt algorithms
Change-Id: Ib35cffa2d5762874feea9b1d4df7f569c0e5f496
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-09 13:41:25 +00:00
Robert Loehning
d4b3789db4 Sqlite: Fix compilation
Broken by 19d941d28d

Change-Id: I7332ef80f12f3c1d99987550c16c1f55fec306da
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-08-09 13:31:27 +00:00
Eike Ziller
c3ee2d06ba Algorithm: Allow sorting container of pointers with member (function)
Change-Id: I2928081750f86b66e969ec2f7ade9e67ce19a825
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-09 13:17:43 +00:00
Orgad Shaneh
a23e0692b4 Utils: Introduce sort variants for member and member function
Change-Id: Iff29f2c55a08e85de7f0ff4e431f326e351e5305
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-09 10:51:28 +00:00
Alessandro Portale
d8e94afb51 Core: Native dir separators for DMgr::getSaveFileName warning
User visible paths need native ones.

Change-Id: I4fbadd9cf63fbb9c513b45eb6001107dbc162f86
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-08 18:48:01 +00:00
Christian Kandeler
47bb7f5780 Fix build with namespaced Qt
Change-Id: I52cb8b88e6555c71e2b86a332fbf63c47b68b7dd
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-08-08 15:30:49 +00:00
Marco Bubke
a0371d91e6 Clang: Make RefactoringClientProxy::setLocalRenamingCallback final
Change-Id: I4e0811e763c71cd427f0497a825967d983ac36eb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 15:03:43 +00:00
Marco Bubke
092df2edaa Clang: Smallstring should not depend on std::ostream
We move the io operators in an extra header file because if we would
include ostream in smallstring.h we would blow the compile time.

Change-Id: Iea61ceedbbbcdd2adc6dc149794dab6e743084f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 15:01:53 +00:00
Marco Bubke
44f62d10ad Clang: Remove unused RefactoringServerProxy::ioDevice
Change-Id: Ie2cb946750ada2f89aa329499f9daaded48ba88e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 14:57:19 +00:00
Jarek Kobus
6490ae0416 Set history completer only once
Avoid setting it many times for one
path chooser, since it raises soft assert
inside FancyLineEdit.

Change-Id: Ie70224b9be577fc38d32f036a67a9b9a1bc3ac56
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-08 14:29:41 +00:00
Marco Bubke
f56ec53fa1 Clang: Test for file path RequestSourceLocationsForRenamingMessage
Change-Id: Ia384deb60e644d8894d7c56f81b3deb8b7706c11
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 14:19:02 +00:00
Tim Jenssen
ba8939926b remove unnecessary include
had a could not find include error with qbs

Change-Id: I72d70b5393bf6ee6b8ff4fd8aa41023470c4762a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-08 13:55:54 +00:00
Marco Bubke
ebb82a2aa9 Clang: Remove undefined behavior
Never forward declare STL container.

Change-Id: Ie2d222f858f555294581bbea90300755973cb54e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 13:50:57 +00:00
Marco Bubke
413a601f69 Clang: Prevent endless recursion
SmallString has a char * constructor.

Change-Id: If48f42c4ef667bda921f9c81fd755af037f6f3cf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 13:50:48 +00:00
Marco Bubke
98a167c0d5 Clang: Fix template renaming
Change-Id: I8040fe8dfc99d66e242ce2ff8589aa914838bfc9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 13:50:25 +00:00
Eike Ziller
fe3a7d6479 Clang: Fix check for libclang on macOS
Change-Id: I8a81905b1fad9155824226f16103cf22ae625429
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 13:29:20 +00:00
Marco Bubke
ec06fd0e84 Clang: Use std::replace instead of std::transform
Change-Id: I60e42577631dee5cf05b1129a49ea36c391e8923
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 13:27:38 +00:00
Marco Bubke
a2bf47266a Clang: Fix naming
Change-Id: Ibf82e92d2c29395e739afcdbe181595e0a3ed012
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 13:27:31 +00:00
Orgad Shaneh
b239f7aa7e Locator: Cleanup
* Use inline member initialization
* Remove unneeded "using"
* Replace if/else with switch-case

Change-Id: I32589e850f259c6e2d098e623077bec0a6f9eb4b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-08 13:27:30 +00:00
Ulf Hermann
a36a6e0ad3 QmlProfiler: Add test for config widget
Change-Id: I468ed3c7f75b79d16231b57246e494e29a89b920
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-08 13:12:42 +00:00
Marco Bubke
82069466ff Clang: Fix include header for *alloc
Change-Id: I41d86785eb6f75411c9e13994d0effe6f0afcef5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-08 12:19:45 +00:00
Christian Stenger
cbd4f80279 AutoTest: Fix setting working directory
If there is no working directory explicitly set inside the run
configuration we end up using the current working directory of
Qt Creator.
We normally get an empty string if not having modified the respective
target ourselves although you can see a default working directory when
opening the respective target for the first time.

Task-number: QTCREATORBUG-16715
Change-Id: I6e16fd4f9b15759793653a6c229c44a1be2b7739
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-08-08 11:11:13 +00:00
Ulf Hermann
670e4e7027 Timeline: Don't crash if creatorTheme() is not available
Change-Id: Ie269aa9542d0f607d475edbbd83de56ad71c6701
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-08 08:36:50 +00:00
Christian Stenger
83eb076e5d Clang: Fix detection of clang libs on macOS
Broke with 4cdb5bab15

Change-Id: I84e54f12f632b87694f9a3e93824558f0098e40b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 08:28:59 +00:00
Ulf Hermann
100b3da662 Android: Make AndroidRunner a plain QObject
We're not using it as QThread.

Change-Id: Ib277325179a46fe7d153ff9d37043f54d0d41037
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-08 08:06:55 +00:00
Christian Kandeler
1a755521ff Update qbs submodule
To HEAD of 1.6 branch.

Change-Id: Ia524058417387e1cb4162e8d8fe35ebb35f6b471
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-05 19:35:45 +00:00
Ulf Hermann
2cc261a184 QmlProfiler: Use timeline theme also for flame graph
Flame graph and timeline are similar in visual appearance, so they can
share theme settings.

Change-Id: I2e078fd8aa55d3b21e31abc82b967093623a2ab3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 14:29:36 +00:00
Ulf Hermann
8448f412ec FlameGraph: Make details window close button themable
Change-Id: I98d7603da0153ce63813c3f91f0e18672f2ffaec
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 13:49:53 +00:00
Ulf Hermann
80933144bd QmlProfiler: Paint binding loop markers in timeline highlight color
Change-Id: I7cf12f87a4d78a2dcfc0a6e9fe7dc460a6ade70f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 13:49:48 +00:00
Alessandro Portale
d318b18c83 QmlDesigner: Fix Selection rubberband on HighDPI
For HighDPI, it is necessary to set the join style. We need MiterJoin in
order not to have a rectangle which has two corners rounded.

This should not have any effect on non-HighDPI systems.

Change-Id: I6e5898c2424cf6f313c45982571b8b0c9940458b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-05 13:15:00 +00:00
Tim Jenssen
09a965cf6c move QTCREATORLOGO_BIG back to coreplugin
It was a regression from the "Move icons to Utils" commit which
broke qbs builds.
QTCREATORLOGO_BIG aka QtProject-qtcreator.png is only used in
coreplugin and have some not moved install logic inside
coreplugin.pro

Change-Id: I8258b845108f8801581d7ee8d6771808b306a602
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-05 12:42:58 +00:00
Ulf Hermann
94ca84c1e4 Timeline: Add some theming
While we're at it, also remove all the weird borders and use standard
icons. The timeline doesn't have a "baroque" theme, it's all flat for
now. If the need arises we can add some gradients here and there.

Change-Id: Ia9ce22d7f412c4999feca2284959be4d734267ac
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 11:35:35 +00:00
Ulf Hermann
15fbfaf2e9 Move icons to Utils
This way we can use them from libraries, not only from plugins.

Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 10:52:53 +00:00
Ulf Hermann
5d6f5ff2c9 QmlProfiler: Move unrelated code out of QmlProfilerClientManager
The client manager should not be bothered with details of QML events,
but rather just connect the client, the model manager, and the state
manager.

Change-Id: Iec4499f8441a06d4ef5cbcf7bfe23da6f5e7f239
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-05 10:44:46 +00:00
Ulf Hermann
4ab130ed9f Utils: Rename the "error" icon to "broken"
It is only used in the pluginview, and "broken" fits in better with
"ok" and "notloaded" for plugin states. Also, we avoid confusion with
the "error" icon in coreicons.h.

Change-Id: I44159a878f60eacf46780b27b4d9c4f31601a9dc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 10:17:08 +00:00
Orgad Shaneh
1853f01a5b Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
2016-08-05 11:40:07 +02:00
Ulf Hermann
713bc04ad4 QmlProfiler: Add a test for clean shutdown of client manager
Change-Id: I0d6deea53302022c18c4aacef395393d60308b84
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-05 08:43:31 +00:00
Ulf Hermann
79a63ef1ed QmlProfiler: Fix log message
Change-Id: I28c723ea15704576b70c0d05c1d615f97a30ce2a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-05 07:56:47 +00:00