Commit Graph

38241 Commits

Author SHA1 Message Date
Erik Verbruggen
990cedeb1b C++: remove C/C++ distinction from ProjectPart fields.
.. because they now hold only files for a single language+extensions
combination.

Task-number: QTCREATORBUG-11709
Task-number: QTCREATORBUG-12818
Change-Id: If294f6de07d60126be733d98de12b89b8af3efce
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-16 17:01:35 +02:00
Tobias Hunger
193cb3b9a5 Qt: Add features for Qt4 and Qt5
Change-Id: I3456c1b62f81c8137fb307b40903ce7b989ad21a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-16 16:55:45 +02:00
Tobias Hunger
cb0a3f5dcc Utils: Remove unused IpAddressLineEdit class
Change-Id: I919e7ab79dc779b9586b74d31271d8ddce817061
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 16:51:45 +02:00
BogDan Vatra
8bb83b514f Force uninstall of any Qt apps that are using Qt < 5.4
On Qt 5.4 the problem was fixed by
https://codereview.qt-project.org/#/c/91261/

Change-Id: Id139fe2fe1e83ac5108ffeeb140cb8d2f16747c7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-16 16:33:51 +02:00
Eike Ziller
3a7ce77a4d Version bump
Change-Id: I4262a5ff65f72e11f2bff0f7edae802aba9b1082
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-16 16:31:47 +02:00
Orgad Shaneh
41942ac088 VCS: Fix displaced comment
Change-Id: I71f0169951b5dfd9cedeff82006b757dd4df756e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-16 16:16:56 +02:00
Tobias Hunger
df50e214f3 QtSupport: Add codegeneration.h/cpp
Change-Id: Iec1d4b303e6154b5d2d32e4d3ab7c02893bcc5f1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-16 16:13:49 +02:00
Orgad Shaneh
850276d9f9 VCS: Make text wrapping independent of actual editor
Narrowing the submit editor down corrupts the commit message

Also fixes the following cases:
# comment that is wrapped
to next line <-- this line currently appears

comment in the middle of
# wrapped line <-- this line currently disappears

Change-Id: I7a35058569f002479c646ef6cfd1fdb1ada401c9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 16:12:45 +02:00
Orgad Shaneh
6158a4ca58 VCS: Avoid repetitive calls to cleanupDescription in submit editor
It is called twice on each change to the text, and called again on
commit.

Change-Id: I8bfa2b37247a270f8b92e0b8a4e581278acf4cea
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 16:12:14 +02:00
Orgad Shaneh
2a8fa5579a VCS: Fix line wrapping for lines that end with a dash
Task-number: QTCREATORBUG-8528
Change-Id: I894e562c3c6568233a85689dc1a759644779adb5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 16:12:10 +02:00
Erik Verbruggen
cc6a9babe0 C++: Move preprocessor settings handling to the document.
This cleans up the handling of those settings, and makes sure that the
C++ document is setting those settings before parsing. This also
prevents lock contention in the parser, because before this patch the
document would kick of the initial parse (after opening a document),
after which the editor would come in and try to set the preprocessor
settings, resulting in the UI thread locking until the initial parse was
done.

Change-Id: Ia2e18a9667e10279f045c1c5849046ec4cfe85ae
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-16 15:38:20 +02:00
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
2014-09-16 15:17:21 +02:00
hjk
11f89ece8d Android: Separate debug and analyze support
The common base class contains only unused functionality.

Change-Id: I5f6db59a2972d6ab8383ce209937090cd46ae39d
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-09-16 13:37:15 +02:00
hjk
3fb7c81a92 Debugger: Better remote engine setup result reporting
Use one less signal for result passing.

Change-Id: I6209d248fb01056835ef65b91981b9b2747d6f7f
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-09-16 13:19:23 +02:00
Tobias Hunger
db6af3f152 VariableManager: Add support for javascript varibales
Add JsExpander that can be used to register additional functionality
in its qscriptengine and to evaluate expressions.

Register that with the VariableManager, using the "JS" prefix.

Change-Id: I7d8f1ddc3484104f3943685dbac09e786d60212e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-16 13:18:14 +02:00
Tobias Hunger
9e4cc1316f VariableManager: Remove unused static variable
Change-Id: I7c53a91dec1e0a863f37d24787582a1ee1ba0adf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 11:53:22 +02:00
Tobias Hunger
c8db57e663 VariableManager: Allow variables that are triggered by a prefix
E.g. "Env:<some environment var>".

Remove the special handling for the "Env:" varibale that was coded
into the VaribaleManager.

Change-Id: If8b074b66eeaa97903b41634f9a3c86dd73087d4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 11:53:09 +02:00
Tobias Hunger
c7703600be Debugger: Quieten warning on testing this for non-0
Clang used to complain about this several dozen times when building
Qt Creator.

Change-Id: I4dadd40de1133fe8558d6b50730f68b40e07de55
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-15 22:19:16 +02:00
Christian Kandeler
5cc3749167 QbsProjectManager: Do not expose the "check timestamps" option.
The functionality it offers is not essential, and it has side-effects
that can lead to bugs if users turn it on for no particular reason.

Change-Id: Iaed660c649de46e7f81d3a1c3311693ed0820d50
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-15 17:39:42 +02:00
Sergey Belyashov
a4db6db358 Update Russian translation
Change-Id: I22a16eaae505d43c31516db98290df3ec667b5e0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-15 17:24:09 +02:00
Oswald Buddenhagen
62da66a0aa AbstractMacroExpander: expand macros recursively
Started-by: Tobias Hunger <tobias.hunger@digia.com>
Change-Id: Id2e88efbb475221cd7c0347f7d5e7009e4372eec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 17:13:57 +02:00
Eike Ziller
f6c2a27218 Add changes file for 3.2.1
Change-Id: I43a7d8d5bfcef33ef7e2370cafec3c409fd9ce25
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-09-15 17:03:27 +02:00
Daniel Teske
1b11f9b3c0 QmakePriFile::update: Don't call buildDir() all the time.
Instead call it once per .pro file and pass that to all .pri file parses
and other functions. This cuts down the number of calls for opening
qtproject.pro from ~3000 to ~700 and speeds up opening qtproject.pro
by roughly 3%.

Change-Id: Iffd46d4bbedc9c380f70e916dae7151495990b39
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:33:20 +02:00
Daniel Teske
0b3d05aec2 SessionManager::openProjects: Don't processEvents() for just one project
Change-Id: I4f3075aa8ab1b3fe12eabe39740d28ff06a87f88
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:16:15 +02:00
Orgad Shaneh
0188b74a65 ClearCase: Use check out comment on check in
Task-number: QTCREATORBUG-12846
Change-Id: I02b3d713df8cc0e28d1bd32a401f692460c5fdbd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:15:26 +02:00
Orgad Shaneh
c69e4f27cb Git: Use the right commit from history before merge
Task-number: QTCREATORBUG-12415
Change-Id: I6328c8b0e3579eeddae9051a9ac5c587426163fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:14:53 +02:00
Orgad Shaneh
8ec4451069 Git: Disallow quotes for branch name
At least on Windows it fails.

Change-Id: I2e119bf47b468a9f881184ad26fa9fbd10f16124
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:14:31 +02:00
Orgad Shaneh
5078b70ddb ClearCase: Fix unreserved checkout
Task-number: QTCREATORBUG-12847
Change-Id: I8b42631adf62cd9b6afea619a17bf01a725a2968
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:13:18 +02:00
Ulf Hermann
74c8faad6d QmlDebug: Move utils dependency into qmldebug_dependencies.pri
Change-Id: Ia5b6fdf4303b889337442903eeb2a4efda6720ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-15 14:04:47 +02:00
Nikita Baryshnikov
f90f4ffdd3 Compile fix for tst_abstracttimelinemodel
Implemented pure virtual methods features, loadData with protected
access modifier

Change-Id: I75b0c0ed1f56a06a401d69f538462367de442d88
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-09-15 13:33:19 +02:00
Christian Kandeler
6046d872e4 qmldebug: Fix qbs build.
Change-Id: Ibfeb6e26404468b02a5bd06a7b2ebc65ead65128
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-09-15 13:22:43 +02:00
Oswald Buddenhagen
df1f576666 use DISTFILES instead of OTHER_FILES in docs, templates, and editors
the latter variable is entirely meaningless to qmake and should have
never been recognized by creator. unfortunately, qmake's dist target
wasn't very useful before qt 5.4, so it didn't occur to anybody to
actually use the variable associated with it, even though it is
semantically exactly the right thing.

Change-Id: I249857f54fdc38fb5ecac0f608e5f4140624c23c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-09-15 13:19:27 +02:00
Oswald Buddenhagen
3e4f17c164 remove pointless uses of OTHER_FILES
these cases are automatically covered by other variables

Change-Id: Ic32411fa361346633d3127be063fcaabc9ef7c28
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:51:02 +02:00
Orgad Shaneh
c0c324d75c QbsPM: Clear progress bar on project unload
Change-Id: I4f695a74032aa9f1e1b4d45f17ab8c4170717297
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-15 12:40:41 +02:00
hjk
1ee2759067 Debugger: Fix boost::unordered_set dumper
Change-Id: Ib356baed758437f5b549df060ca3ee62ee61b9fb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-15 12:12:13 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:10:01 +02:00
Daniel Teske
7dbb9b2678 DesktopQmakeRunConfiguration: Use Qt5 connects
The future is now.

Change-Id: I68fa2fc75d8fe4437600a808949892e9002d950d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 11:54:52 +02:00
Christian Kandeler
5e4f3a4f4e QbsProjectManager: Turn the timestamp check off by default.
One line was overlooked in a recent patch that intended to do this.

Change-Id: I1c344c4e25d47b2c4cc89071c2a4e059b451c9fd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-15 11:45:30 +02:00
Christian Kandeler
4cfaeb8b51 QbsProjectManager: Fix crash when calling QbsProject::files().
We can't do that during parsing, as qbs::Project::buildSystemFiles()
might run into a race condition.

Change-Id: Iae3fd3000fdc71fec50c82d50fb3b4e3888351bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-15 11:45:16 +02:00
Eike Ziller
a29de8f7ad Fix build of qmldebug library
It was missing the dependency to the utils lib

Change-Id: I215dff08036b3cfb7a28cedad99932bb7dd916f1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 10:55:11 +02:00
Orgad Shaneh
41ea3ffea8 Git: Fix comment indentation in BranchAddDialog
Change-Id: Ia1cd72b598555681e62444f6843a746049c5c04d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-15 10:08:18 +02:00
Ulf Hermann
0234148249 QmlDebug: Fix typo
Change-Id: I5e316ada7d03c465a7f60246e2c04e1a89078689
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:16:26 +02:00
Ulf Hermann
84d5afcbf4 QmlProfiler: Document which thread scene graph events come from
It's very nice to see that at a glance, rather than searching around
in the code.

Change-Id: I1d1cdf10d98578ca1fe3275fdf2dfc98f6499eed
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:16:17 +02:00
Ulf Hermann
344712646a QmlProfiler: Provide UI for hiding and showing categories
Change-Id: Ia1e2cd87523d53d4a2d0de9f74980e05c565f8e0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:16:05 +02:00
Ulf Hermann
8c080e909a QmlProfiler: Make timeline expand buttons actual Button items
It looks better, both in the code and in the result.

Change-Id: I5d24b24de429fb6a6d15c2df97f977924bb9fb00
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:58 +02:00
Ulf Hermann
2b362de064 QmlProfiler: introduce properties for empty, hidden and displayName
Like this we can properly refer to them from QML.

Change-Id: I98378d543d307f78909191225e72c9d0404dfa1d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:52 +02:00
Ulf Hermann
5799901bcc QmlProfiler: Protect AbstractTimelineModel's loadData() and clear()
They really shouldn't be called from outside. We'll introduce an
"empty" property whose notify signal will depend on data handling to be
done in a controlled way.

Change-Id: I272eaa3638ba571d9f9ffd964b0d33449d0adda1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:43 +02:00
Ulf Hermann
2e11197bca QmlProfiler: Centralize timeline rowCount calculation
Change-Id: I0db3641c0d6e750459d815e25909babf8534a4f6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:39 +02:00
Ulf Hermann
69743fef93 QmlProfiler: Filter event types also on client side
Like this we can still save some time and memory if the profiled
application doesn't support filtering.

Change-Id: I534ad4a11f62d28bd2fcfbffdc44f3902758dcbe
Task-number: QTBUG-41118
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:30 +02:00
Ulf Hermann
6d58de0bad QmlProfiler: Allow preselection of events to be recorded
This allows us to reduce the amount of data we need to handle
if the user isn't interested in certain categories.

Task-number: QTBUG-41118
Change-Id: Ieaac12fb1dec29d6035642f433bc1a1d49e545c2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:24 +02:00