Commit Graph

44349 Commits

Author SHA1 Message Date
Orgad Shaneh
b963ad78bb CDB: Add a missing include
Required for strlen. Detected by clang code model.

Change-Id: Ide38c387ae55a74ce2aa365af261a633c0fd1b52
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-07-05 07:13:47 +00:00
Orgad Shaneh
98585ba5d2 CDB: Make a local function static
Change-Id: I91f694a6fdfe4f8efb038180da376081ec9d1ad6
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-07-05 07:13:27 +00:00
Orgad Shaneh
3bc0af9b60 CDB: Add breaks on switch-case
Detected by clang code model.

Change-Id: I9b9d857d8b8310714d942427ace6f44078a5b046
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-07-05 07:13:07 +00:00
Nikolai Kosjar
fcc0648ba1 Clang: Emit a warning if LLVM_INSTALL_DIR is not set
Change-Id: I18f02e0878e2037857ccd85943c13bbac9cade6b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-07-04 14:36:26 +00:00
Jochen Becher
1bb11c5b83 ModelEditor: Avoid corrupt diagrams after moving end of relation
Change-Id: If0a2a62d3ef7e59242b244d6892e83bb71315164
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-04 13:56:04 +00:00
Jochen Becher
222f89472f ModelEditor: Avoid chrashes if model is broken
Add some debugging code checking integrity of diagrams. Based on the
analysis avoid chrashes if ends of relations on diagrams are gone.

Change-Id: I86da4a6d422de5d51e551b44e7842e992590958c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-04 13:55:51 +00:00
Nikolai Kosjar
36e7f4541f Clang: Pass on file paths with native separators
libclang 3.8 seems to be sensitive to file paths separators [1]. On Windows,
this led to not updated document annotations and/or crashes after reparsing.

When passing file paths to libclang, convert to native separators.
When getting file paths from libclang, convert back.

This handles:
 * main file path
 * file paths of the unsaved files
 * -I<DIR> arguments, the resource path (for builtins) and the paths to the
   wrapped qt headers
 * included header files from libclang
 * source locations from libclang

Also, minimize the conversion in SourceLocation to a minimum by making
filePath() lazy.

[1] https://llvm.org/bugs/show_bug.cgi?id=28381

Change-Id: If5866f34a6fdc6b34b16c022d3988e8e6eae2a0a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-04 13:08:03 +00:00
Orgad Shaneh
0f46ad9cb1 ResourceEditor: Reorder member functions
First signals, then protected and private.

Change-Id: Ieed013bb35785542e10e697c1a1dc135c0c94cce
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-04 11:41:01 +00:00
Orgad Shaneh
604a937f3c ResourceEditor: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I74e7371cccd6578217722b4b7717cad66db258f7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-04 11:40:57 +00:00
Orgad Shaneh
8568b4d1ca ClangStaticAnalyzer: Simplify signal connection
Change-Id: Ia710c47a11ca08b9e12d81555ff6288583e6ad63
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-07-04 11:22:54 +00:00
Orgad Shaneh
7b71ac3821 BuildOutputParser: Use Qt5-style connects
Change-Id: Ib0e2e77d4e0215d1d2d50a00981fd8d6269f544f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-04 10:50:42 +00:00
Orgad Shaneh
32ea9a644d QmlPM: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I8fe343c8e7cfc9b0e620afe4ae947f9e997899f9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-04 10:37:57 +00:00
hjk
a3adfc75b9 ProjectExplorer: Remove a use of sender()
Change-Id: Iaee2412879f7a0a9108a8da2ee15b70ad983c845
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-04 10:23:50 +00:00
Christian Kandeler
ce4ddcb060 Update qbs submodule
To HEAD of 1.5 branch.

Change-Id: Ib42ba2dcf30bbe8ad2b088cab1649da7375d5cd6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-07-04 10:15:48 +00:00
Christian Kandeler
fdb764b24b QbsProjectManager: Fix crash on Kit update
Before accessing qbs::Project methods, we need to check whether this
object is valid.

Change-Id: I6c54f5b1118a3960b4814af647d81f5786fa452d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-07-04 09:36:21 +00:00
Orgad Shaneh
88dfa84fc6 Android: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: Id09b62b7b9812d9c0981202c257d18387a8b09d9
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-07-04 09:35:58 +00:00
Orgad Shaneh
c3acbc46ed CrashHandler: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I236fca3e8741d0e8ff510045dc7e51dda076546a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-04 09:09:34 +00:00
Ulf Hermann
4f7477872b QmlProfiler: Fix another type/event misnomer
Change-Id: I135c4355b36f0ce7fe0aa2e108dbab1a7dc866e3
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-07-04 07:31:27 +00:00
Alessandro Portale
f556057924 Core: Make FancyActionBar actions theme aware
The text in the FancyActionBar actions had hardcoded text colors, which
by accidend looked OK with the current themes. But light themes require
these texts to follow the theme.

This patch removes the uncommon "shadows" under the text, instead of
trying to make text shadows themable.

Change-Id: Ie0e3a9673f24ead64dcdd8963319dc1908afb3aa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-04 07:05:42 +00:00
Alessandro Portale
e2dab0cf07 QmlDesigner: Replace custom +/- button icons in connectioneditor
Use the themable ones from Core::Icons instead

Change-Id: I45e831e9b0586bfde6468acca07b6138b48f82e0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-01 15:51:48 +00:00
Thomas Hartmann
0db6f2a372 QmlDesigner: A StateChangeScript can be the child of a State
I found this while testing our demos.

Change-Id: I575e1d2f487a2ba137ac8181f4980c30b171f726
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 15:29:32 +00:00
Thomas Hartmann
31eae7bd3e QmlDesigner: Remove hover effect from tab bar
In the property editor there is no hover effect.
The hover effect is simply not required.

Change-Id: I7e918be7e0ac2186fa02c2cae30ad19e90e8ac75
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 15:01:49 +00:00
Thomas Hartmann
89baea009e QmlDesigner: Unify the look of the tab bar
Change-Id: I2778b959ad75473cbba3639e008a03a105357180
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 14:35:29 +00:00
Thomas Hartmann
7e41952782 QmlDesigner: Adding whitespace to MouseArea in item library
Change-Id: I10785a7c5529dfb08575df7bd8865167bfeecd01
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 13:48:00 +00:00
Thomas Hartmann
aea9f7281f QmlDesigner: Change caption of tab bar in connection view
Dynamic Properties was to long since we have to set a fixed with
for tabs when using css.
Properties should be still clear enough and the preserved
space imrpoves usability significantly.

Change-Id: I484822918d78e89e96c587314bcaeda78c7e95b0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 12:26:21 +00:00
Thomas Hartmann
8dfe5590ce QmlDesigner: Remove border radius from .css
This is more consistent with the new flat style and the QML styling.

Change-Id: I750620227dc0b79a6518dcef9cfb86986a09cef4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 11:42:38 +00:00
Orgad Shaneh
e3b1c9b912 RemoteLinux: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I1a03435bbb4281bad4ff64baba0182e0050170d6
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-07-01 11:29:27 +00:00
Thomas Hartmann
802edc9d8f QmlDesigner: Set scrollbar css for dynamic properties view
Change-Id: If40a106529e4d02b30620c4b885cd5a956acdd5c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-01 10:30:13 +00:00
Tobias Hunger
79f0fef4a2 autotest: Fix warning on missing override
Change-Id: I93acb387269e6ee02c968bea18f6ce347d18656a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-01 10:06:04 +00:00
Alessandro Portale
611c2c3c2e Timeline: Fix a runtime error message
qrc:/timeline/TimelineContent.qml:147: TypeError: Property 'clearData'
of object Timeline::TimelineRenderer_QML_135(0x99b4468) is not a
function

Change-Id: I2adfaa9ad764cde42462de6ebc22a897d3b7a74c
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-07-01 09:45:44 +00:00
Tim Jenssen
1c739aeccb WelcomePage: displayName is used and not display
Somehow thought that displayName is already in
QAbstractListModel::roleNames(). Also removed unnecessaey default
roles.

Task-number: QTCREATORBUG-16483
Change-Id: I6651502ee91b20eb1af7e22a67b6b67077ad8aaa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-07-01 08:43:03 +00:00
Christian Kandeler
bd609e8e1e qbs build: Replace deprecated constructs
Change-Id: I5a66a5b805b912a8ee752306d6c39759085e98ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-30 15:55:30 +00:00
Orgad Shaneh
c8688c0798 QmakeAndroidSupport: Minor cleanup
Add a helper function that casts the project to QmakeProject. Will be
used in the follow-up commit for connecting a slot.

Change-Id: I17e23630ac88c117da9bac61dd045f94661e35f0
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-06-30 13:45:51 +00:00
Orgad Shaneh
3410fee65f Ios: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I1b25f0108939d87e859d0407a35f75b88fa0edc3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-30 12:12:09 +00:00
Orgad Shaneh
a21e71ec1a Help: Remove unused function
Leftover from 5cf2972345.

Change-Id: Ia1e7debd3d5e2edeac41bae091d0057fa77a84bc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-30 12:12:03 +00:00
Orgad Shaneh
d01adc134d Help: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: Ied9c7fcc031e530c41b342de950e2f0ac730bbb1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-30 12:12:00 +00:00
Christian Kandeler
700239c681 Update qbs submodule.
To HEAD of master branch. Plus some necessary adaptations due to API
change.

Change-Id: I906918223de3946ae532ae4042c2545dd53b66cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-30 11:35:29 +00:00
Robert Loehning
23b3bb5814 Ask before reloading file changed with external editor
To be consistent with other ways of starting external editors.

Change-Id: Ia6f8d2179076482999ef527353feb91a49e1a2d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-30 11:17:29 +00:00
Christian Stenger
e69144d1da Core: Assign an explicit parent for main editor area
This avoids failing updates of the main window (e.g. windowTitle)
before the main editor area is displayed first time.

Change-Id: I5c559f9487872e47b1fd914f0aec16b0b2f1dec3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-30 10:08:56 +00:00
Marco Bubke
d027cab44e Clang: Rename Ipc* in ClangCodeModel*
We want to share more functionality of the IPC mechanism and for what we
need more interface classes. But we use this names already for the
ClangCodeModel implementation. So we rename the them to ClangCodeModel*.

Change-Id: Ie320e0d3b993586a9bcc6a5aa0d32427af41202e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-30 09:28:56 +00:00
Nikita Baryshnikov
ac5d84372a Git: fix compilation
comparison between QDialogButtonBox and QMessageBox enum values.
Introduced here: 34f75be322

Change-Id: I19b50e5a4da643e7917346af19170022ffe61f34
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-30 08:59:23 +00:00
Eike Ziller
ee1da81f55 Merge remote-tracking branch 'origin/4.1'
Change-Id: If6cd798a25de0c6eb1b386177c11bf8de535aa42
2016-06-30 09:40:29 +02:00
Eike Ziller
a99d529a93 Merge remote-tracking branch 'origin/4.0' into 4.1
Change-Id: Ice4824c6148c8b960f9a61c6685387727627b38d
2016-06-30 09:33:48 +02:00
Jochen Becher
1ccec9882d ModelEditor: Zoom with Ctrl + mouse wheel
Change-Id: I2e703345a882f0dbd80a0957d5f28bd203f4f26b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
(cherry picked from commit 3e776dde5e)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-29 15:16:05 +00:00
Tim Jenssen
8fbd3cd32e QmlDesigner: fix regression from last code cleanup
Task-number: QTCREATORBUG-16516
Change-Id: Ic77d325c131a594f69b6fbbb6b1d6be6374b45a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-29 14:30:47 +00:00
Thomas Hartmann
ebffc0555e QmlDesigner: Making adding signal handlers more user friendly
The "Go to implementation" context menu was adding a new signal
handler if no signal handler was already present.
This does not change, but I add "Add new Signal Handler" that always
adds a new signal handler, even if one already exists.

Change-Id: I7d1f012fda114d22598a9dd650ee14d97d48cd1d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-29 13:35:52 +00:00
Thomas Hartmann
e6be4484a6 QmlDesigner.MetaInfo: Initiliase property info lazily
There exists cases where collecting the properties is
very slow. We only have to do this on demand
for the property editor.

Change-Id: I92d7270481db94655c95ab8d69f373488d841b4e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-29 13:14:48 +00:00
Thomas Hartmann
334273be84 QmlDesigner: Update qrc files
This triggers an update on every qrc file.

Change-Id: Id34873e3bd8190d79773fbc3a8a90699d4e49cb0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-29 13:14:44 +00:00
Orgad Shaneh
a22d8bcaa3 QbsPM: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I841454b0815bc697ae2372dbc6d2caa59d7dc3e8
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-29 13:03:03 +00:00
Orgad Shaneh
eacd012b96 Utils: De-slot and complete Qt5 connects
The only Qt4-style [dis]connects left are in BaseTreeView::setModel.

Change-Id: I53bb715750c65827005cc96939a6714606e60f81
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-29 11:46:13 +00:00