Commit Graph

45962 Commits

Author SHA1 Message Date
Tim Jenssen
f54dcc4c81 Qnx: modernize editor connect
Change-Id: I8fe1c8906b7d7b9adda78e5aabf99232bee3ffab
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-19 11:15:52 +00:00
hjk
10ca24347f Android: Minor code cosmetics
Connects, namespaces, includes, ...

Change-Id: I066a03e528df0e485f8ac473db94f17175277fb4
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-05-19 08:58:40 +00:00
Thiago Macieira
411bc70df0 Re-align code that was misaligned, triggering GCC 6 warning
propertyeditorview.cpp:191:5: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
propertyeditorview.cpp:201:9: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’

Change-Id: Ie9fd7afe060b4e4a8052fffd144fe3e908d3d18e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-19 08:04:40 +00:00
Eike Ziller
10a4b6b752 OS X: Fix build with Qbs
Change-Id: Ic125eba1ceacf3582fffdadd992a46910f6347cc
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-18 15:53:23 +00:00
Orgad Shaneh
b790ba245a QmlDesigner: Remove unused source files
Logger component and an unused header.

Change-Id: I3e92a4ea3c13eee4bef2a1e452a51509eeab2b17
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-18 14:31:40 +00:00
Orgad Shaneh
3734cd65a7 Qbs: Use wildcards for images in Utils
Change-Id: I6e77c6664d5eab41581ed9e357b8cc72b20273b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-18 14:15:08 +00:00
Ulf Hermann
d667b25f94 Timeline: Remove shadows and rounded corners from details windows
Change-Id: Ibbeb087b61cda1b66e9d4d894c01e24144c2d26c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-18 13:18:34 +00:00
Christian Stenger
0496473c55 AutoTest: More separation of test tree item and model
Change-Id: Icb096a1af749e74a3f47bc5235a4c0f0c2ce6023
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-18 11:13:20 +00:00
Alessandro Portale
b9e941105d Todo: Fix a premature ::tr() call
The order of meta object initialization and the call of tr() can be
wrong, and then the Todo plugin is not loaded.

Change-Id: I2d8481892e78af5e04d632c427d55d2a2fd67402
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-18 10:45:31 +00:00
Eike Ziller
ec231b5910 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/valgrind/valgrindruncontrolfactory.cpp

Change-Id: I96c0f8cc3b49f8f55f45ef1f839857f878f532f4
2016-05-18 12:12:46 +02:00
Jake Petroules
ac9360a2c1 qbs: apply compiler and linker flags from GCC toolchains.
Change-Id: I27ce0b11238a2a0c9e5f2f1f8d9e5ecfa3cc51f9
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-18 09:17:33 +00:00
Robert Loehning
8c8ed3294f Squish: Raise timeout for help content
Change-Id: Idc53e974a271d0c833ca8371c9a65b0c6d98c45c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-18 08:43:45 +00:00
Orgad Shaneh
906c7c1727 ClangStaticAnalyzer: Use native separators in exe placeholder
Change-Id: I49399d4d1b8c35332e223abd77886de60d155c28
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-18 08:30:28 +00:00
Eike Ziller
37b25c38b4 EditorManager: Remove now unneeded QLatin1String wrappers
Change-Id: Iecd3a76a2434ad069cb9a9d066fadfb7cf728d6c
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-18 08:08:10 +00:00
Eike Ziller
40c25df80f EditorManager: Use non-static member initialization
And initialize some members that were not really initialized before.

Change-Id: I2c32187c406774595b1575fdfb6d1a4f1116f478
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-18 07:56:02 +00:00
Eike Ziller
9e05cfa9c3 Locator: Add missing break in switch-case
Lead to the tiny bug that one could not trigger a shortcut "Alt+Escape"
while in the locator input field

Change-Id: I4eb3182588357f8ce0817459b3d20e4bbd87287a
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-18 07:55:52 +00:00
Eike Ziller
3dd6bf2b96 Core: Add override to models
Change-Id: I89de84e2de0dcce759170d124a214a8d4c004130
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-18 07:55:43 +00:00
Eike Ziller
3109145526 DocumentModel: Use entryAtRow at one more place
instead of hardcoding the logic of the "<no document>" entry.

Change-Id: Id1cf934ee256ef264da97b1495773f36d8c053ef
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-18 07:55:32 +00:00
Anatoly Stolbov
369b46ee68 TextEditor: fix folding of all nested blocks of folded block
Now all sub-blocks of folded block don`t became folded too when we add
new blocks in document

Change-Id: Id347d99195d2835a1de46a397175ff9fa68bb1ae
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-18 07:27:12 +00:00
Christian Stenger
8daaa2f651 Debugger: Restructure cleaning up after test
If the test case would result in a failing test it does not
execute further commands.
Ensure to close possible open editors even for failed test runs.

Change-Id: Ifcdcb76de5d10f649d38b84dad8999c6fd491ade
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-18 07:16:26 +00:00
hjk
ddd6fa88bf Debugger: Prevent lookup of C++11 keywords as variables
Take the opportunity to de-noise.

Change-Id: I0b9cfea127305ad72c0514625d9ffbd848c74409
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-18 07:15:10 +00:00
Nikita Baryshnikov
c2919c673b ModelEditor: fix compiler warning
this 'if' clause does not guard

Change-Id: If549d4a005dd41c9cc01a3bd7a774c47839aa202
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-18 06:59:42 +00:00
David Schulz
8da31c87ee Add version number to lib dependencies on windows.
Change-Id: Ied3707f18cf2753679eeaa2bcff0edfba3c7517e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-18 05:02:40 +00:00
Joerg Bornemann
3c63b621d9 QbsProjectManager: Write MSVC compiler version to profile
Change-Id: Ibd8c559ffecf327eee6af8e6d5fbacb5c8c863d1
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-18 02:56:47 +00:00
hjk
e9e47ab452 Debugger: Allow re-evaluation of certain expressions without stepping
There are cases like changing an Evaluated Expression that make
re-evaluation necessary.

Change-Id: I51fe46b67399a59aebbdeb9c3e778795b1c52cf1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-17 16:01:52 +00:00
Christian Kandeler
fb3ffe4c2f qml2puppet: Fix qbs build.
Change-Id: I688b21cad35eb96676e7d39c20641b9312542cb2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-17 14:48:15 +00:00
Christian Kandeler
f72c927b37 qbs build: Un-break and re-add QmlDesigner product.
Change-Id: I2d4c069ef2d566ed466f0ba6a4f24a90ea6ffba9
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-17 14:38:56 +00:00
Orgad Shaneh
b5d6441562 ClangStaticAnalyzer: Really cancel on user request
Currently when clicking the X icon next to Clang Static Analyzer
progress bar, clang is no longer executed, but the mouse cursor remains
busy, and trying to quit Qt Creator warns about running analyzer.

Change-Id: I1dc8b92fdaf03cd25a2ad40d24d0f76907dd791c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-17 13:21:41 +00:00
Robert Loehning
990e2a83ca Squish: Fix tst_HELP02
We don't just need any items in the model,
we need an item that passes the filter.

Change-Id: I831a8a2d4ba27c838e7ea07625d066a19946a789
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-17 13:11:31 +00:00
Christian Stenger
2e7361bb1e Valgrind: Avoid crash when having no configured runnable
Change-Id: Ie4da5712f68176e26aaf5cda1bc1f6cb74899970
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-17 12:51:55 +00:00
Alessandro Portale
ad55f0bd84 Debugger: Proper menu icon for "Profile Costs of This Function..."
Don't use the toolbar variant, there.

Change-Id: I820d3e51567bfeff4eec2277f20b52fb617d1eee
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-05-17 10:49:06 +00:00
Ulf Hermann
070897091a QmlProfiler: Don't crash if there is no QmlJSModelManager
Change-Id: I63b978f0f9c42c8968da7e779cdff876c18d8f31
Task-number: QTCREATORBUG-16276
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-17 10:24:42 +00:00
Ulf Hermann
f0dcda8592 Timeline: Tolerate TimelineModelAggregator::prevItem(m, -1, t)
Apparently there is some way of having a valid model index and an
invalid item index in QML root item. We don't know how that happens,
but we can work around it with a one character change.

Change-Id: Id2f611bfefe3119f3527e10b00249036d883334f
Task-number: QTCREATORBUG-16282
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-17 10:19:15 +00:00
Orgad Shaneh
aca8f9a731 UnitTest: Fix compilation
Change-Id: I4aa18c552bdfb8bb685e224b63c6080f25afa567
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-17 10:17:43 +00:00
Christian Kandeler
0ec8d3a16a Beautifier: Fix qbs build.
Change-Id: Iea7a1b68f038e69450790512ac7147c8a17585ad
Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-17 09:12:50 +00:00
Christian Kandeler
93ad38da2d QbsProjectManager: Update "equivalent command line" on build dir change.
Task-number: QTCREATORBUG-16260
Change-Id: Ic18efbdf62a648aa4b524bb36dbcce581061981f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-17 09:11:25 +00:00
Christian Kandeler
94d7d18404 qbs build: Remove some differences to qmake build results.
- Install library symlinks.
- Do not create symlinks for plugins.
- Skip some translations.
- Rename some binaries.
- Do not install the ptracepreload library.

Change-Id: I0faa98034154e3840cd2695cab14b72c34cfc5c3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-17 09:10:34 +00:00
Christian Kandeler
bab9b1bbe1 qbs build: Add product file for qml2puppet.
Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-17 09:10:04 +00:00
Vlad Seryakov
a59ab991f2 OS X: Handle webview load error
Change-Id: Iabe841c6c8d03b667061521952ae4944bf425e62
Reviewed-by: Vlad Seryakov <vseryakov@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-17 08:00:42 +00:00
Orgad Shaneh
62c60c6d1c Git: Filter obsolete branch names when adding a branch
Task-number: QTCREATORBUG-16264
Change-Id: Ifcb04c7740ab274be590f53757e013da43ad96f1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-05-17 05:07:39 +00:00
Orgad Shaneh
43f8f04ed6 Git: Show current branch even if it is obsolete
Change-Id: I694284c359812d9d0030fcdd934af4b98722aaa0
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-05-17 05:07:34 +00:00
Lorenz Haas
e195c87299 Beautifier: Add option to automatically format files on save
Change-Id: I72fb3f4b728df7ef3e449c1202df9cbb0279dde4
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-15 16:16:03 +00:00
Viktor Ostashevskyi
7379741ea1 Ukrainian translation update for 4.0
Change-Id: Ib1ebf53cf3815b86e3ecf0df2824c5baf0b12f18
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-05-14 18:57:18 +00:00
Nikita Baryshnikov
41cf9d7b33 QmlJsLib: fix compiler warning
this 'else' clause does not guard

Change-Id: Ica781d2fe0d179107ee121badb17e2078420ffba
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-05-13 16:50:30 +00:00
Eike Ziller
6efd8e33e2 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I6217662f0c51d04a83f7a85dc5d7c7f25e78e09a
2016-05-13 16:24:37 +02:00
Eike Ziller
ae3b4f1a06 Linux deployment: Only add RPATH to Qt if necessary
Don't try to add an RPATH to Qt if the library/executable
does not link to Qt. Chances are, that the reserved space
for the RPATH is too short in that case.

Change-Id: Ie8d50ede43d19236611fe56667995e58606062db
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-13 12:58:41 +00:00
Tim Jenssen
bd0b76b167 fix build
Change-Id: I11ac4138b8501060da0a125d38481e3b1d6853a9
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-13 12:03:15 +00:00
Christian Kandeler
8b78231356 clangbackend: Add missing rpath setting in qbs product.
And another linker flag that was present in the qmake project file, but
not in the qbs one.

Change-Id: I703d5df2171cf97974111993aec8ed244435afec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-13 11:57:28 +00:00
Tim Jenssen
7e08363052 qbs build: remove unnecessary script dependency
Change-Id: I0e5764ffc9a6146932c43d96a31138451260c161
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-13 11:42:43 +00:00
Christian Stenger
1914329ec2 Squish: Fix tst_HELP02
Content of the QHelpContentWidget gets populated asynchronously,
so wait a bit to have at least one entry - which normally should
be our own documentation.

Change-Id: Iad78f0bab0dd7f2f5a83cd94d2b2830ba146f554
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-13 11:36:55 +00:00