Commit Graph

25792 Commits

Author SHA1 Message Date
hjk
12440fa137 projectexplorer: processlists are useful for windows desktops, too
Change-Id: Ief75ee62b544b419a8c4d758e275092007603862
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-06 12:04:24 +02:00
hjk
11f5c81385 processlist: prepare for all desktop devices having a processlist
Change-Id: I0b1a7c51bfcfcd53efa87b678da513b6b546c55c
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-06 12:00:35 +02:00
Konstantin Tokarev
da3e3200af ResourceEditor: copy current resource path to clipboard
This menu action provides easy way to insert references to resources
into source code.

Change-Id: I3a77910e82c6ef896cac8a2562d59bb9db78efa2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-06 11:57:41 +02:00
Christian Kandeler
da0b6b8182 Device support: Implement process listing for the Desktop device.
Unix only for now. Windows to follow later.

Change-Id: I2a5742373f8c849ba3852c933780f9bfa96ba2de
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-06 11:41:36 +02:00
Eike Ziller
a0fa7fd39f Layout fixes for target settings.
More horizontal and vertical space.

Change-Id: Ieae970d9ac15df32531fb934799eff6d589bc3e4
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-06 11:36:31 +02:00
thohartm
156bfd2e7f Fixes layout in welcome page
For some languages (e. g. russian) we have to wrap.

Task-number: QTCREATORBUG-7675
Change-Id: Ib49a2c7b11a16228010934db89c5c0e60b8e465c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
(cherry picked from commit ed0c57ee5a)
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-08-06 10:43:27 +02:00
hjk
83e573f2ec use new id comparison operators to reduce line noise and save cycles
Change-Id: I2e7d81a4efb75877901d29964df4f71314e951b4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-06 10:37:43 +02:00
Eike Ziller
10dadfadbe Version bump
Change-Id: I0e977f306e7398b9bd8b832be24b3ec2e6f3d67f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-06 09:31:40 +02:00
hjk
7ca93f9b1e coreid: add overload for ==(const char *)
Saves code on caller side and cycles for the hashing.

Change-Id: I9d0c739b44a4611a4d70d33cf2798e0b078a72b5
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-06 09:14:25 +02:00
Eike Ziller
c81a4000b5 Merge remote-tracking branch 'origin/2.6' 2012-08-06 09:08:03 +02:00
Friedemann Kleint
6441d5f214 Fix linking of the core plugin on Windows.
DestroyIcon needs user32.dll.

Introduced by e0f16c3093 .

Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
(cherry picked from commit 506df46f0b)

Change-Id: I11075c9cb911af403cb5ded74437c5a785fb768c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-08-03 18:30:57 +02:00
Eike Ziller
98f3bd2930 Windows: Fix resource leak
Task-number: QTCREATORBUG-7385

Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
(cherry picked from commit e0f16c3093)

Change-Id: I85e0fc108eafea1abb7d4d559d1020163969e664
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-08-03 18:30:13 +02:00
Orgad Shaneh
69eeb94b7e Git: Support gitfile on commit
Change-Id: Ia2b8c7705129937a60585d881e1fbfa7815d858f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-03 18:02:37 +02:00
Oswald Buddenhagen
8b0844d032 fix basic variables not being initialized any more
QMAKE_INTERNAL_INCLUDED_FEATURES is added even before loading the first
prf file, so the check for an empty value map would never trigger. use a
flag variable instead.

Change-Id: If0af31d8466eadb90eca2a2e4024eff03b54e3b1
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-03 13:59:05 +02:00
hjk
271da8c06b buildsettingswidget: remove a function called only once
Change-Id: I6bce707b0dd2cbf207c02b89b27a2c0a31f62126
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-03 12:57:07 +02:00
Christian Kandeler
1d00146e21 Device support: Move processes dialog creation to settings widget.
With the process list model being publicly available from the IDevice
interface, there's no longer a need to force all subclasses to create
the dialog themselves via opaque handles.
Since clients can now check whether a device offers a process list,
the base process list model has been made abstract.

Change-Id: If4a0aa68a95b221862c287ad8397ebabe9be5909
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-03 10:40:31 +02:00
hjk
aa2434d093 profilechooser: make tooltip more verbose
Change-Id: I9262663e2d85d3fc1a1faa311804afb395bdb7dc
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-03 09:49:37 +02:00
hjk
01b8f2ac8d qt4project: remove unneeded cast
Functionality is available in base class.

Change-Id: I795dd3ef0cf535e796b08a3671065b5121582c17
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-03 09:13:10 +02:00
Yuchen Deng
a3323de814 Fix cross compilation
Change-Id: I092277ae6e9a35910ee9cbaa1806e0d848339bbb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-02 16:51:48 +02:00
Christian Kandeler
ed920f446c Device support: Let devices create project list model.
Now each device gets to decide in what way a process list
is set up and how a process gets killed. This enables
e.g. non-SSH based devices to provide process lists.
The default implementation provides an empty list.

Change-Id: Ibb352cd8a5ea556951b02ba512208daeb3b1e1a6
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-02 16:43:10 +02:00
Friedemann Kleint
64651be53e First update of German translation for 2.6.
Change-Id: Ie8d41e66ebeb2cca88bb007037a4f452802171e9
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-08-02 16:40:02 +02:00
Friedemann Kleint
87adb49557 tr()-Fixes for 2.6.
- Remove trailing blanks
- Fix remaining rich texts in Android UI.

Change-Id: I8ea5ec6890d76b83257fd1eb79eeb2760b946f0b
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-08-02 16:06:23 +02:00
Oswald Buddenhagen
5bd33a7999 add cache() function
follow suit with qmake ...

Change-Id: I8be9b0ecdc45c6358fe00d03ea5d9e77c631c3bb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-02 13:49:21 +02:00
Oswald Buddenhagen
48e0923095 cache mkspecPaths
instead of re-generating mkspecPaths on each use (which is exactly once
for the makespec itself and additionally any queries of $$[QMAKE_MKSPECS]),
do it only once.
now projects don't need to inherit the root env's m_qmakepath any more,
as they are guaranteed not to need rebuilding the cache. instead, they
must inherit the cache, obviously.

Change-Id: Id8e80279a11e8d975b73fd542ecc36d24c57f2f4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-02 13:47:38 +02:00
Oswald Buddenhagen
4a9702e921 make sure featureRoots is pre-cached in the root envs
just clearing the cache to signal the need for reconstruction is a pretty
safe way to ensure that every subproject will do the same work.
now projects don't need to inherit the root env's m_qmakefeatures any more,
as they are guaranteed not to need rebuilding the cache.

Change-Id: Ibc0b2d39dabf4a47430975ad30c6b32689de7854
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-02 13:46:57 +02:00
Oswald Buddenhagen
5fecb00738 remove unneeded initializations of basic variables
03a84a7e5 re-introduced them unnecessarily after 55cad4a42 made them to be
evaluated by the parser already.

Change-Id: I1a121567fdd791f5c47c23babc4946a11b3e1f31
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-02 13:45:57 +02:00
Oswald Buddenhagen
60e96cbff5 make use of ProFileEvaluator::value()
no need to duplicate the code

Change-Id: Icc27e028dbb97faf9e48aba11dd5749526ee1e9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-02 13:45:52 +02:00
Oswald Buddenhagen
2545468f10 make sure every project file evaluation has basic variables set up
now that the basic variables are not magic any more, we need to make
sure they are initialized.

Change-Id: I75a9b66b95f84599fb9af1f4787a752319344fcb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-02 13:45:45 +02:00
Oswald Buddenhagen
10a87a96c3 add "blob" and "lines" modes to $$cat() and $$system()
follow suit with qmake ...

Change-Id: I091c2f10f547d8f339a2f0cadf5a49cfe0a88cea
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-02 13:45:14 +02:00
Oswald Buddenhagen
212a12f312 directly forward system() output to console
this makes it identical to the bootstrapped path used by qmake itself.

this applies only to full qmake mode.

Change-Id: I7100315fe95d0ee900f6bea2552c9292e3d1a07d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-02 13:45:03 +02:00
Friedemann Kleint
b5abaa27df CDB: Fix STL debugger helpers for MSVC2012 beta.
In MSVC2012, more bases classes for std::string
and containers were introduced whereas std::pair_base
was removed compared to MSVC2010.

Add a findMember() function to be able to skip base
classes when looking for a certain member to finally
fix this issue.
Introduce SymbolGroupValue::parent()/childCount()
and simplify the helpers using it.

Change-Id: I7a6aad5c07739ca9cbf350489acd6d03bd1865e8
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-02 13:43:28 +02:00
thohartm
ed0c57ee5a Fixes layout in welcome page
For some languages (e. g. russian) we have to wrap.


Task-number: QTCREATORBUG-7675
Change-Id: Ib49a2c7b11a16228010934db89c5c0e60b8e465c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-02 13:33:55 +02:00
Robert Loehning
c45ae0e288 Fixes arguments in string
Change-Id: I825141db85aaf5f9eb1d0f0fbe0d7bb9836b350e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-02 10:51:01 +02:00
Christian Kandeler
753c62d75e Device support: Introduce IDevice helper classes.
These are for configuration of process and ports gathering activities,
respectively.
This couples related functionality more tightly, while keeping
the number of IDevice methods at a reasonable level.
For ports gathering, the patch also adds the ability to configure
both the command and the parsing function; the latter used to be
hardcoded in the PortsGatherer class.

Change-Id: I1b8940397a51efa7ddc05dd15cf861777d118c1a
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-02 10:36:04 +02:00
Robert Loehning
ac8150624a Improved translated strings
Change-Id: I92e2a87d063894d4992451ee0e9fe2a99d298eb2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-02 08:52:05 +02:00
Eike Ziller
2af6aa1575 Open target preferences from "No valid target" page.
Change-Id: I417bb698798afa2a917224000ca839b67319f976
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-02 07:43:10 +02:00
Eike Ziller
d9f8a25f80 Merge remote-tracking branch 'origin/2.6' 2012-08-02 07:41:18 +02:00
Friedemann Kleint
ee8e1122ba tr()-fixes for 2.6.
- Fix typos and various capitalization errors.
- Fix wrong placeholders.
- Remove QCoreApplication::tr().
- Fix androidpackagecreationwidget.ui, remove translation
  from combo and clean up some HTML markup.

Change-Id: I51bcdad90c770c0f861a9d17e92b9c9222c6e8bf
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-08-01 17:19:02 +02:00
Oswald Buddenhagen
fa91da2d41 add write_file() function
follow suit with qmake ...

Change-Id: I4e57e160b811b6496adf208b49f1dd0df0b57563
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:49:02 +02:00
Oswald Buddenhagen
b7c3b390f5 add touch() function
follow suit with qmake ...

Change-Id: I906bf83bbbb106cddd8becd85faef8e1c4c5d64f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:48:49 +02:00
Oswald Buddenhagen
5febcd2ddc add mkpath() function
follow suit with qmake ...

Change-Id: I9ad3b3a6765b5e44cb9da87401f29c838d59491d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:48:31 +02:00
Oswald Buddenhagen
1c98f30e80 add log() function
follow suit with qmake ...

using fputs() instead of the fancy handler functions, as this is only for
qmake, which would just print to stdout anyway.

Change-Id: I0433d8157ce8c6e580b3fec6f622896b972f7b48
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:48:20 +02:00
Oswald Buddenhagen
f1a3a2d00c don't set m_sourceRoot if it equals m_buildRoot
Change-Id: I3e20c2a9b4455f7e9fcc60202166d1a8a079cba2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:48:05 +02:00
Oswald Buddenhagen
369fdc3aee optimization & clarification of m_skipLevel use
as the branch evaluation in non-cumulative mode nowadays actually skips
code instead of merely incrementing m_skipLevel, !m_cumulative implies
!m_skipLevel. based on that we can eliminate some always true/false
conditionals, and hard-wire m_skipLevel to zero if
PROEVALUATOR_CUMULATIVE is not #defined.

Change-Id: I19569ff96f21a5074f677b873ed800a6818f1a6b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:47:47 +02:00
Oswald Buddenhagen
459d6f8e40 don't print an empty line if system() produces no stderr
Change-Id: I88d85c70334de2a5f913b6c67d0d253094979fd8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:47:04 +02:00
Oswald Buddenhagen
76db45fafe make error() actually cancel execution in non-cumulative mode
Change-Id: I50289cdfe906c923076a4a2dc57f7ca35c8e9b90
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:45:57 +02:00
Oswald Buddenhagen
986c953ac6 minor speedup of message()/warning()/error()
properly identify the function in the dispatcher, to save an additional
string comparison later.

Change-Id: I6bb88bf620f5f47416d8f58cf00050913fc3aa4b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:45:45 +02:00
Oswald Buddenhagen
5249053473 bring isEmpty() semantics in line with qmake
qmake doesn't check if there is exactly one empty element - be it
because (theoretically) there can be no empty elements.

Change-Id: I603f2a472c02d270eafd1b3f6f9adae4349b3af0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:45:37 +02:00
Oswald Buddenhagen
d77f76374a make defined() support testing definedness of variables
follow suit with qmake ...

Change-Id: I9b8a7b64df812c4c5a5ee25eaf931629feca0689
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:45:28 +02:00
Oswald Buddenhagen
c865baa2be slightly more elegant eof signalling
we don't really use the current character at this point, so don't fake
it and use the cur pointer as a flag.

Change-Id: I0dd31ff07fafe0748b88b3a573d25b689f0c3748
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:45:17 +02:00