Commit Graph

44349 Commits

Author SHA1 Message Date
Christian Stenger
7efe8f429c Tools: Disable building clangrefactoringbackend
Needs adaption of the usually used pre-built packages of libclang.
Qt Creator currently uses a special build that only provides
libraries as needed so far.
clangrefactoringbackend tries to link against several libraries which
aren't present when using these pre-built packages.

Change-Id: I663c36109fd4c6e98bff6521b376785a7d948624
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-05 07:28:29 +00:00
Christian Stenger
612dd96307 Help: Fix fallback font family on UNIX
Use "Sans Serif" as it is done inside Qt sources as well.
Otherwise we run into the soft assert when retrieving the
default  fallback font style name on Linux systems.

(Tested with Ubuntu, OpenSuSE, Arch Linux, Gentoo)

Change-Id: Icf04a8ec4ace5014c5526a5a5e5ef45c48660afd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 04:39:44 +00:00
Orgad Shaneh
b041c6c8d9 Utils: Add a missing include in small string
Change-Id: I95717e170bfba3f4a1f089536676b73ba40b1df4
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-08-04 17:00:50 +00:00
Alessandro Portale
04c136b92f Qml Designer Theming: Fix background color
The background color for light theme is too dark. Instead of trying hard
to deduct that color mathematically, let's add a theme role for it.

Change-Id: I6a49d43e7e11c87427242819c67988b05b87518b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-04 14:56:08 +00:00
Leena Miettinen
423255e052 ResourceEditor: Fix typos in non-translatable, but user-visible strings
RessourceEditor.RemoveNonExistign > ResourceEditor.RemoveNonExisting
in Tools > Options > Environment > Keyboard.

Change-Id: I4c76c216350f1984d6429db74a60190928332a65
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-04 14:55:37 +00:00
Alessandro Portale
13ca2a3390 MiniProjectTargetSelector: remove dead code
Setting the palette does not seem to have any effect.
(May be due to the applied stylesheets overriding everything)

Change-Id: I27fd8395274009dbe83a0bde3fc3ac68fc16a435
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-04 14:46:19 +00:00
Marco Bubke
4cdb5bab15 Clang: Add clang refactoring
Change-Id: I2e3f36f810276da3f8dc7dcc587b06f8edb586d3
GPush-Base: d02f51b48fc752fddcdef6dcb32b3f7f6c0195a3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-04 14:37:19 +00:00
hjk
2b9edb35ea Debugger: Slim down public QmlInspectorAgent interface
Change-Id: Ia2f728029530dfe4e3f4cc9c18313453f4851bc4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-04 10:51:40 +00:00
hjk
588443b259 Debugger: Use a StandardRunnable for the debugger process
One step further to separate the debugger environment from the
inferior environment and to make it possible to configure a
working directory. Guessing one from the inferior's working
directory is not always a good idea.

Change-Id: I33d139c0f228ec0870556b82bc6aecca0a8e62d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-04 10:07:43 +00:00
Orgad Shaneh
506e23dc11 ProParser: Remove QT_VERSION_CHECK
We only support Qt 5.6 now.

Change-Id: I768918fa26d8edbc578b1e4794e7387ddeb9c4cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-04 09:14:22 +00:00
hjk
00cd726608 Debugger: Add more safety net for failing dumper
In case a dumper explicitly reports the presence of children
but fails to extract them, remove the model's desire to
see them by re-setting the 'wantsChildren' hint explicitly
after a full update.

Change-Id: I09d3d3dd67067d22d39f7685b57570ecb42984d2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-04 09:04:04 +00:00
Christian Stenger
88e612f262 Nim: Set environment for running project
Avoids command line warning
"QtcProcess::start: Empty environment set when running".

Change-Id: I230a33762dd20134c9d439624ca360acf2cbf956
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2016-08-04 08:48:22 +00:00
Filippo Cucchetto
3c1c37f1cb Nim: Removed wrong asserts triggered during restore of buildsteps
During the restore phase the project buildsteps could be null.
So during the checks if the project already contains a build/clean
step we should handle the null case.

Change-Id: I6a2bb66fc9c12004ab4fff6be4da4c44dec9c063
Task-number: QTCREATORBUG-16687
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-04 08:35:30 +00:00
Ulf Hermann
20db17e4f0 Debugger: Only use random QML port if none was given
Change-Id: Ice80ac46d5b8a0f24fa3b18ad8197b360fb6361f
Task-number: QTCREATORBUG-16708
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-04 07:21:45 +00:00
Orgad Shaneh
82c6eedfae Autotest: Remove use of deprecated Qt::ItemIsTristate
Change-Id: I66fd41e3b63ef43359ba4dea61f7bc9bd0b683f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-04 07:21:12 +00:00
Orgad Shaneh
ae04c174fe Add some missing includes
Change-Id: I4db93e3388cd9ca4cbee84f012eda8c222f45cf1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-04 06:32:28 +00:00
Ulf Hermann
428f3f4c22 Debugger: Do a hard shutdown when QML debugger is stopped
There is no point in trying to "gracefully" shutdown by waiting for the
application to hit the next line of JavaScript. The application might
never execute any more JavaScript.

Change-Id: Id531a2b23ce9aa12462e308f29106f8cefa67092
Task-number: QTCREATORBUG-16709
Reviewed-by: hjk <hjk@qt.io>
2016-08-03 15:39:52 +00:00
Vikas Pachdha
7458d82a37 Fixes Permission model downgrade issue
Task-number: QTCREATORBUG-16630
Change-Id: I2ec8fbe186d9a78efa1457a5fbbbaf1fe4da80b5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-08-03 13:29:36 +00:00
Vikas Pachdha
5cdff92c58 Refactoring: Android Deployment failure error codes
Change-Id: I88165fcad770e8b8341b252e4fc32b437528647b
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-08-03 13:26:40 +00:00
David Schulz
4b74fc4322 Debugger: Fix empty memory when viewing inaccessible address
Always report back when content for the memory view is requested.

Task-number: QTCREATORBUG-16555
Change-Id: Idc6202a392899c5d524c696ac7342c4ea4487b1e
Reviewed-by: hjk <hjk@qt.io>
2016-08-03 12:25:31 +00:00
hjk
7e73e9c48f Debugger: Remove unused WatchItem::state flag
Lately it was only set and read for debugging purposes. A mechanism
similar to the ChildrenNeeded state is still needed and available
through WatchItem::wantsChildren.

Change-Id: I78c85d65bc35810be420bd0418db9675473697cd
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-03 11:29:23 +00:00
hjk
a6acd3e8d9 TreeModel: Introduce a TreeItem::indexInParent() convenience function
To shorten user code and hide the ugly const_cast.

Change-Id: I798bd105932004ea17cb95b243fc38ccfcda0a2c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-03 09:24:01 +00:00
hjk
def8ca8ba1 TreeModel: Move some base TreeItem code out-of-line
Avoid code explosion.

Change-Id: I7d239a4560e90b68cc4991341adf940a98776254
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-03 09:23:46 +00:00
Orgad Shaneh
feb3d6a864 ProjectExplorer: Load images lazily in mini target selector
Change-Id: Ifbaca8dc6d94327ab30c1ddbe99246131e06f3c0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-03 08:35:50 +00:00
hjk
be2a0b9ecd TreeModel: Remove BaseTreeModel::topLevelItemCount()
Not used, and easily done with rootItem()->childCount() in case it
is needed again.

Change-Id: I7e85ac1bb72b3a799987b1bf6bd54d21b7ab06ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-03 07:54:35 +00:00
hjk
8eca665307 GLSL: Remove some dead code
Commented out since the initial import in 2010

Change-Id: Icdb6ced53b39b2fda7037616cf9d2f098279e534
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-08-03 06:14:14 +00:00
Nazar Gerasymchuk
90629108fc UI files: Fix tab order in lots of UI forms
For unknown reasons tab order in listed UI files was set incorrectly and
behave unexpectedly. Now tab order behave naturally.

Changes made for listed objects and touches only UI.

Change-Id: I057b95eb21943ddb29b108682618382661db7be9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 14:29:27 +00:00
Christian Stenger
59b57241b3 Debugger: Fix startup of PdbEngine
If the Modules view of the debugger is one of the enabled views
the command for fetching modules is triggered before the
PdbEngine could start up at all.
Ignore the respective command if the engine is currently requested
to start.

Change-Id: I509d122ecba4f3bde6b2139a519c9a12ac627c2f
Reviewed-by: hjk <hjk@qt.io>
2016-08-02 14:01:06 +00:00
Ulf Hermann
68f904fb55 Debugger: Remove unused variable
Change-Id: I14058602e0220295ad0e7e91d38d0b6ca83d7e22
Reviewed-by: hjk <hjk@qt.io>
2016-08-02 13:54:54 +00:00
Ulf Hermann
421a66b101 Debugger: Only clear the locals view when updating the QML locals
There is no reason to clear all the other views, too. The inspector
view stays valid across interruptions and the C++ views have nothing
to do with this at all.

Change-Id: I7a0bfe160a6b3c0134d592abef9c10f95fcfcd3f
Task-number: QTCREATORBUG-16692
Reviewed-by: hjk <hjk@qt.io>
2016-08-02 13:51:55 +00:00
Marco Bubke
4d29ca2d3a Utils: Add clone functions to small string
Change-Id: I4e1ff40437253ce9fa047b476edb5d69654963b2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 13:38:32 +00:00
Marco Bubke
95ace75cc4 Utils: Add QDataStream operator to small string
Change-Id: If46e8933b484d6780505dd57e45596e44fccc83c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 13:38:27 +00:00
Marco Bubke
0549c6af97 Utils: Add std::string conversion constructor and operator to small string
Change-Id: Ia76d7647fc8d2c9b72bc5bce2e7a6e2c3fcc18cc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 13:38:23 +00:00
Marco Bubke
390e2d164c Utils: Add iterator constructors to small string
Change-Id: Ib8fcacd5dc520842cf5cee73ea21c021221158ca
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 13:38:19 +00:00
Marco Bubke
7610e48716 Utils: Fix smallstring
Change-Id: I681df8c3fd9aa84f14d5d581633894605f56b71a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 13:38:14 +00:00
Nikita Baryshnikov
395d0045bd OutputPanes code style fixes
Change-Id: I58c4fd1369dc2d6400416b0366b1d357a3308523
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-02 12:39:26 +00:00
Ulf Hermann
4bbd89d1b3 Debugger: Register step out action also for QML
Change-Id: I11dceb325d5611bb5a0d9fb9750dbefdea60f2dc
Task-number: QTCREATORBUG-16691
Reviewed-by: hjk <hjk@qt.io>
2016-08-02 11:16:45 +00:00
Lars Knoll
61e7ac7cee Improve error reporting when parsing JSON files
At least report the error string and the file offset where
the error happened.

Change-Id: Iaa1733593b8af2a7a52b67c0f495731f045d2c11
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from qtbase/34c24ceb1ffce964c9f139d84b6b271bd2e45c33)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-08-02 07:58:32 +00:00
Oswald Buddenhagen
962d1122bb add $$sorted() function
[ChangeLog][qmake] Added $$sorted() function.

Change-Id: Ic069d3ef7c0b7a260c714c76eecc71c41417d01f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
(cherry picked from qtbase/50e22c765343102c4e0acf1eee8a6ce6f6f39ccf)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:58:18 +00:00
Oswald Buddenhagen
f174dfee6a add $$str_member() function
just like $$member(), but operates on a string value rather than a list
variable. it is the swiss army knife of cutting, providing equivalents
of left(), right(), mid() and reverse() all in one.

[ChangeLog][qmake] Added $$str_member() function.

Change-Id: I7c7c6c971db402fff41b428d32a4451f45400728
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
(cherry picked from qtbase/e70330f99e53bd34a518879a0a4c68bc7cb03949)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:58:14 +00:00
Oswald Buddenhagen
8f7928e616 add $$str_size() function
this is strlen(), but the name is matched to $$size(), just namespaced
to reflect that it operates on a string value rather than a list
variable.

[ChangeLog][qmake] Added $$str_size() function.

Change-Id: I56c8b863da244e66bd283257a66b197aa73b0e57
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
(cherry picked from qtbase/22f3800cac47b1b3d10474e8489ddb83cffd4b1e)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:58:10 +00:00
Oswald Buddenhagen
455cc5a9f8 add $$num_add() (numeric addition) function
amazing how we managed to do without it for so long. ^^

the name is intentionally somewhat obscure to avoid clashes, and some
namespacing is good anyway.

[ChangeLog][qmake] Added $$num_add() function.

Change-Id: Ib7648b1f425ef096a87b51f158d0f1409e5c4daa
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/d3cc25ef52d0b2b7ba1cb06609f7c205ee19c2d6)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:58:01 +00:00
Oswald Buddenhagen
5237499742 add $$take_first() and $$take_last() functions
while implementing stacks and queues was possible before with the help
of $$member(), these functions make it much more straight-forward.

[ChangeLog][qmake] Added $$take_first() and $$take_last() functions.

Change-Id: I4922a5331780e468a42c663c9ad3c6456a95a6bf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
(cherry picked from qtbase/3d21634fb693634b7d41a152287d29afb80ac5e2)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:57:53 +00:00
Oswald Buddenhagen
1d8ae55a57 make split_value_list() take a QStringRef as input
this also saves some of the cheap but ugly toQString() calls.

Change-Id: Iebe644986501db3878306521c76e4ba2c2fb97b4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/981f8ad2e4bc46d9a06dab0cbc32a7da755ececb)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:57:48 +00:00
Oswald Buddenhagen
b7706cdfeb make QMakeParser take a QStringRef as input
the only place where this actually saves a deep copy is the evaluation
of if(), but as a side effect the parser is now able to deal with not
null-terminated strings, which is kinda nice as well.

Change-Id: Ib6d08617aa79d2f9eaecd4906d4d548f34bf377d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from qtbase/ad17a35853fe21a93fc34f7b2d9262c5ac992b29)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:57:26 +00:00
Oswald Buddenhagen
50b87b3a8d add ProStringList::join(ProString) overload and make use of it
Change-Id: Ic3919a1fa9419bbb3b57dd1aa7eb95643ee59e53
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/e45a9fe457a4e5e70bf4e62092b253675dc97819)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:57:19 +00:00
Oswald Buddenhagen
ddd749b130 introduce a new way to pass arbitrary arguments to the project file
this is done by recognizing the -- option and putting everything that
follows it into the QMAKE_EXTRA_ARGS variable.

the purpose of this is being able to pass "alien" arguments (for example
configure options) without having to marshal them into a qmake variable
assignment manually. this is expected to greatly enhance the convenience
when no wrapper script (i.e., configure itself) is used (which will be
the case outside qtbase).

Change-Id: I47735bdab2811d17d7d394fbf638ebd14332ea73
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
(cherry picked from qtbase/26d44fce3dfb9dbd3b5be2a031fff8c1bb903960)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:57:11 +00:00
Oswald Buddenhagen
ca1f4a265d add ProString::toLongLong() and make use of it
this is just a bit cleaner.

Change-Id: I03e628aca9e2e53c602a4db724da277a0e2c2486
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/e6b755e702fd6d8ebeb25ecd7a5059e62da6c971)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:56:43 +00:00
Oswald Buddenhagen
c4382290f0 remove pointless conversion to QString in isTrue()
Change-Id: I7766672018dd4acf9b9fb89acfe664671de4bc3d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/7931395d5bf30d783449e1696edf8d59b81462ed)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:56:37 +00:00
Oswald Buddenhagen
5da274828a remove pointless conversions to QString when converting to int
this doesn't change a lot, but is cleaner.

Change-Id: Ia89c399d6df7cc6264954cf309d2c971a5592d6b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/a7a3cd643a554c717ad8fb2bdad3e941dfd94cec)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-02 07:56:29 +00:00