Commit Graph

46254 Commits

Author SHA1 Message Date
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
hjk
df8e3b5925 Debugger: Let perspectives specify their central widget
The default 0 value will be interpreted as 'use the editor stack'.

Also, drop the idea of value semantics for Perspective objects
to get a simpler approach to the destruction of owned widgets
(tools docks + central widget)

Change-Id: Ic6470411ee5d387c43447f95b5a12c81c6658ff8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-13 11:34:00 +00:00
Christian Stenger
dbfa9280b0 Squish: Fix assigning shortcut
Change-Id: I32d563a198ec1e56b86e97f6803dd2e15f1bd565
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-13 11:26:43 +00:00
Christian Stenger
07ba87349d Squish: Fix accessing Options on OSX
Accessing the application menu inside the menubar of OSX
does not work properly since using Qt5.
For some time using default keysequences worked fine, but
for the Preferences (Options menu) this stopped working,
so make the used hack even more crude.

Change-Id: I48ed37dc69b8c64f649f0130d48d4deb02afb87e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-13 11:08:06 +00:00
hjk
602d899e0f Move CustomExecutableRunConfiguration to ProjectExplorer
There's nothing QtSupport specific in there.

Change-Id: I616a37ed56f1853cdbb16f483de5682d5ea63715
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-13 11:03:06 +00:00
Christian Kandeler
87e8f03c03 Set the right version number on our binaries.
While we have not encountered issues so far with using the default
values, it seems more correct to set the version so that e.g. on Unix
a library's soname contains the actual Qt Creator major version etc.
For good measure, also set the compatibility version on OS X.

Change-Id: I956c473e0b440fc87ffe1aaf99af626da733b5fb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-13 10:42:18 +00:00
Nikita Baryshnikov
7c5836986f vcs: fix compiler warning
this 'if' clause does not guard

Change-Id: I91cdabf9b770f58cc59ca00df6574c757c2618b5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-13 08:48:12 +00:00
Nikita Baryshnikov
ccb7aa8185 CPlusPlus: fix gcc warning
this 'if' clause does not guard

Change-Id: I004cb72dff2213738c59701d99748d7338991105
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-13 07:41:37 +00:00
Nikita Baryshnikov
3eb81f3708 QtSupport: fix compiler warning
this 'if' clause does not guard

Change-Id: Ibeb7fa3c531d4896028931697f7af479e2c99c4b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-13 07:40:23 +00:00