Commit Graph

45338 Commits

Author SHA1 Message Date
Tobias Hunger
26bc22adc5 QMake: Modernize
Change-Id: I05dd2cb4923ad2c72c0c79d24baa2c12677eff06
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-29 14:54:17 +00:00
Tobias Hunger
4115a028ed Qmake: Small cleanup
Change-Id: I94808212d5bde61935c1e21d62cda7ea56c0a1be
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-29 14:53:58 +00:00
Tobias Hunger
34b18c699c CMake: Normalize file paths before comparing them
On windows we got false negatives due to one path starting with "C:" and
the other with "c:". Use Utils::FileName which should do the right thing.

Change-Id: I7dcf8ad3f61caca7ac7c183d492ebfd57fe1b669
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-29 11:46:19 +00:00
Ulf Hermann
35bafd3952 QmlJS: Fix resolution of "alias" directives in qrc files
Previously qrc paths of QML/JS documents were not considered for
implicit imports. Only the path of the document in the file system
was considered. The QML engine, however, doesn't know the original
path at all and only uses the qrc paths for import resolution. This
created a mismatch between what the QML engine could recognize and
what the code model suggested.

Without alias directives, any files imported from a qrc file would
have to reside in the same directory as the one implicitly importing
them, so this arrangement happened to work, most of the time.

In order to support aliases we have to search the files in the same
qrc path to figure out the imports. To do that, we keep a reverse
map of qrc paths to files in the QrcParser and iterate that when
resolving imports.

Change-Id: I84baae6cbfbe96ddd5322c81494c1e4a3f473f3f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-29 11:20:57 +00:00
Alessandro Portale
9af85186e6 Icons: More visible "puched edge"
Overlayed icons are not clearly enough visible. This was mentioned by
Diana and by several users. This change fixes that.

Change-Id: If3e767b5248c9802a1e3d255f6d314660a4efff6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-28 18:47:08 +00:00
Orgad Shaneh
0a89b89065 Valgrind: Fix memory leaks
Detected by memcheck.

Change-Id: I7eaf4cf7ee2b4c03b03bfc1bbc2d49c68612b6ad
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-26 17:25:43 +00:00
Orgad Shaneh
e13f1a5047 Debugger: Fix memory leaks
Detected by memcheck.

Change-Id: I56c0c39f3aa2251d6425ddc9388fdebc511d7f47
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-26 17:25:04 +00:00
Alessandro Portale
93ef19b232 iOS: Set the proper runcontrol icon
This is the only RunControl which set another icon than
ProjectExplorer::Icons::RUN_SMALL. I assume that was a mistake.

Change-Id: I1c31909827c03b2c9b7acb0488eb269ef30c2a34
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-25 21:10:19 +00:00
Orgad Shaneh
f9a49118dd Valgrind: Remove unused and unimplemented function
Change-Id: I5f7571f5f275881b67556ed1d53589bd5a7d0110
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-25 17:20:12 +00:00
Giuseppe D'Angelo
fb137ade7d Fix crash in VariableChooser
fce83bd9f84883f93829e6ca9eacf098b018a02d in qtbase causes a crash:
setModel creates a new selection model, which calls currentChanged,
which accesses an uninitialized member. Hence, protect the access to it.

Change-Id: I144f40aa4286f1a9edba24519a30c08ff5091f57
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-24 16:05:26 +00:00
Orgad Shaneh
658d29335b Debugger: Re-enable item selection in watches for core dump
In 7de7eb6bca the behavior on Unrunnable
state was changed, probably by mistake.

AddWatcherWhileRunningCapability should allow adding watchers while
running, but it should not prevent selection when not supported and
the inferior is not running.

Another missing part was that Unrunnable was considered running,
although it shouldn't.

Change-Id: I7d27b81977a6921919327b3122a865b7ffa2d0bd
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-24 15:36:49 +00:00
Ulf Hermann
9ddf44cb9a QmlProfiler: remove dead code
Change-Id: I9f55fa23056b33fe55d0621058978aa45b0fa622
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-24 15:22:24 +00:00
hjk
259c3cb4d4 Debugger: Fix object leakage on shutdown and heap-use-after-free.
Task-number: QTCREATORBUG-15938
Change-Id: I437756705c33730398a129651fabe34c92334656
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-24 15:02:56 +00:00
hjk
af55f36eaf Debugger: Also copy fallback data on Copy View Contents to Editor
Getting e.g. an object's address is better than an empty value.

Change-Id: Ia78335da8b9eadeadc2e6f1757399ae604eb6610
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-24 12:55:18 +00:00
Alessandro Portale
4ef953a83a Icon exporter: Add filtering option
Generation and optimization of all icons becomes slower with each added
icon. Regex based filtering by element will save me time.

Change-Id: I0d621e6ce78968d5a04d3f595f7c5ef60c129432
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-24 11:27:10 +00:00
Orgad Shaneh
ffe939271e Utils: Fix SmallString deallocate with clang
Change-Id: I131a5713e886e062d917112f2d2466e3752bed84
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-03-24 08:47:52 +00:00
Nikita Baryshnikov
5f91cb0d68 CppTools: fix metatype registration macro usage
in places where we do not need it

Change-Id: Ibf35f8144da859fffa3e0a7b6bb262284ec2292a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-03-24 08:15:44 +00:00
Nikita Baryshnikov
2cf72a628d TextBrowserHelpViewer: cleanup
removed  loadResource which was left from
96e8f0bb7b.

Change-Id: Ie1b00412104735b5f3e67939c99dc6cd68d85522
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-23 15:37:17 +00:00
hjk
e16b02c680 Debugger: Move kit guessing out of run control creation
It's only used when starting with a -debug command line and
when attaching to a running run control. No need to clutter
the normal codepaths with it.

Change-Id: Ib374c64a7f63fa79e88967573c37a5da1f415d50
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-23 14:19:19 +00:00
hjk
0301a703ec Debugger: Remove unneeded re-init of RunParameters::useTerminal
... and some dead code.

Change-Id: I22fc6f8ecc09c4c3b928d7b7a510e762a54c0f8f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-23 14:12:01 +00:00
Christian Kandeler
6b2b58477f QbsProjectManager: Turn some errors into warnings when loading projects.
If at all possible, we want to load a project even in the presence of
some problems in project files, so that users can still navigate it even
if it cannot be built successfully.

Change-Id: If938d43b4c02a3e90d3066e0c6820e6b63cc58d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-23 13:57:01 +00:00
Tim Jenssen
50b1bf629e QmlDesigner: remove unused code
Change-Id: I00bc1b533f065b87a8d1b46e3296f76bf05b85d4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-03-23 12:13:48 +00:00
Mitch Curtis
8a7349dc6b Add "e" as nmenomic for File > Sessions
This is especially useful if you work on several projects, and
therefore don't use -lastsession. Currently there's a bit of arrow key
navigation involved to get to the Sessions item, so this speeds up
users' workflows.

Change-Id: Ic77741ce88acd6e34cf7d3a253a2b3d6c9b2b514
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-23 11:55:18 +00:00
Mitch Curtis
bbb0de0553 Dark theme: make "changed variable" text color in watch window readable
It was a pure red, which is really hard to read against a dark
background. This patch makes it a pastel red; the same color as error
messages in the application output, which was implemented in f4a9eaf3.

Change-Id: If013c7215d50c3a75d62031ab19874cfb8545cad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-23 11:55:10 +00:00
hjk
78228d37db Debugger: Reduce scope of scratch data in run control setup
Keep magic guessing to a minimum.

Change-Id: I3474b4406fa047dff468e853bd6fee7c962e065d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-23 09:35:09 +00:00
Eike Ziller
62cbe69cd2 Clearer separation of flat output pane buttons
Change-Id: Id3072715592d8333cb488561ba1e0d1828de6acf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-23 09:12:35 +00:00
Alessandro Portale
22a262e8f6 ProjectExplorer: Flat desktop device icon for flat themes
This change flattens the desktop device icon in the mode bar. Only for
themes which set the FlatSideBarIcons flag.

":///DESKTOP///" deduplicates to Constants::DESKTOP_DEVICE_ICON

Change-Id: Ie31d9c501db2a1e36edbfac59abdd22a4d8c6773
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-23 08:57:59 +00:00
hjk
c371166904 Debugger: Fix import of system GDB pretty printer
Task-number: QTCREATORBUG-15923
Change-Id: I9b8d343f39dd34c33eff05c369bbceb7a581c995
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-23 08:56:43 +00:00
David Schulz
5da8ea0432 Editor: Fix assert in color preview.
The event that triggers the hoverhandler can occur on the last position
in a textline. This position is identical to the text length.

Change-Id: Ia73685b69793fc305094db6611c95c3f03e3a8eb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-23 08:43:22 +00:00
Leena Miettinen
f3fab4423f Doc: using Qt Labs Controls
- Describe the wizard
- Mention Labs Controls besides older Controls

Change-Id: Ib9182c5ebc9c8ee4478018dd5ef29841284eb3de
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-23 08:20:21 +00:00
hjk
f1a6ae83c1 Debugger: Fix creation of task list entries
The debugger validation was operating on wrong language data,
i.e. run unconditionally even on pure Qml projects that doesn't
require an external debugger.

Change-Id: Ic9c96d88f2014d62e8720f1e80134f561fc40bb9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-23 08:10:59 +00:00
Eike Ziller
ed8b492728 Fix tool tips of output pane buttons
Were not shown anymore. Regression already in 3.6.

Change-Id: Id92a7655423add70864a123e16e4a3d344289612
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-23 07:45:34 +00:00
hjk
bc95eaaa23 Debugger: Don't re-evaluate language choices
Change-Id: Idca373abbca7c381bdb0af9c0db6763285700ed8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-23 07:24:36 +00:00
Christian Kandeler
e4de466cdd Debugger: Fix typo.
Change-Id: Ie81f9e0fc2ba8eb56019e2b9332298bdb60198a5
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-22 17:24:19 +00:00
Christian Kandeler
fb51c98b8e ImageViewer: Fix qbs build.
Change-Id: I7dd26214f33952a4116f52cd5bb525913e013b78
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-03-22 16:58:48 +00:00
Orgad Shaneh
05c1d8ef55 Debugger: Provide addresses for formatted pointers
Pointers often don't have an address at all, or have the pointer's
address instaed of the target address.

For example:
int main()
{
  char str[11] = "HelloWorld";
  char *s1 = str; // s1 shows its own address
}

Change-Id: I2436578c073a00a3fec9411ef7ec82ae4e63a8b0
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-22 15:56:54 +00:00
Leena Miettinen
059f4a03e1 Doc: Analyze mode was merged to Debug mode
Remove a screen shot.

Change-Id: I37510534d64ab70fe7966cd2718e50acb9da669e
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-22 15:33:59 +00:00
hjk
e7d0559312 ProjectExplorer: Initialize StandardRunnable::runMode
Change-Id: I762e968b827640a4ad7d8b86edc1531c2558d33e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
v4.0.0-beta1
2016-03-22 14:59:58 +00:00
Christian Stenger
0d73cfb28d Debugger: Fix language/engine detection
Task-number: QTCREATORBUG-15896
Change-Id: I5bc5ed11652932911bdf3b1107998c54353b1268
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-22 13:57:19 +00:00
hjk
903e40a91d Debugger: Fix initialization of StartParameters::useTerminal
Change-Id: I8b03b02323c6c4d9d714a6cc0ebc7ee40c0abf92
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-22 13:56:03 +00:00
Tim Jenssen
3cf5f29719 QmlPuppet: fix Qt 5.5 builds
Change-Id: I520be5d188e637c222ba3e709f072e2881b20db9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-22 13:15:36 +00:00
David Schulz
202711c770 Debugger: Use the cdb process environment to search for symbol paths.
Change-Id: Ia2cfa060c7c836db13bd1cabbde82c7630e4eb33
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-22 13:15:35 +00:00
Orgad Shaneh
13dea114e2 CMake: Show build progress in compile output
Broken by 578c107a16.

Change-Id: I2427dbc36f70a20a453fc6fd13f29589f07a7fcf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-22 10:42:02 +00:00
Orgad Shaneh
6a76d054a3 Tests: Fix offsets compilation with Qt < 5.7
Use private member access method from:
http://bloglitb.blogspot.com/2011/12/access-to-private-members-
safer.html

Enable boost tests also for Qt 5.7.

Change-Id: I8641a9549a341be49890c5b0d88d2b7e9937abb7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-22 07:40:58 +00:00
Eike Ziller
ac6a2bd899 Help: Set sensible fallback fonts
The default fallback font was arbitrary. So far this was not a big issue
because it was basically never used.

Set sensible fallback fonts on the different platforms.
Also make sure that we can see in the settings if the default fallback
font has been changed by the user, and also separate the setting for the
different font properties. Since we did not do this before, we now have
to reset the setting for all existing users, so they benefit from the
more sensible default.

Task-number: QTCREATORBUG-15887
Change-Id: I16419f54c300580d5c9a9b19722aacf790ef66fc
GPush-Base: 44820dae13
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2016-03-21 15:26:18 +00:00
hjk
db3217af36 Debugger: Make QVariant dumper more robust
Change-Id: Ic9ce15eaf88f8a5267c9e8d3f9d049d9b2035eb1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-21 15:03:03 +00:00
Alessandro Portale
ddde4bdd27 Utils: Improved handling of StyleHelper::baseColor
This change makes sure that the "UI coloring" feature respects the
original brightness of the current theme. It prevents dark themes from
getting a too light recoloring and vice versa.

Extra benefit: this allows to remove much recently introduced code.

Change-Id: Ib2c96e7ed172a4cc97520aa4b5d180cc6353c661
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-21 14:23:23 +00:00
hjk
2baa1f8b77 Bump required Qt version to 5.5
Change-Id: I4f152bde842c20b0dade863ffea118fe32322c5b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-21 13:44:13 +00:00
Friedemann Kleint
ea0c23771c DocumentManager::setCurrentDesignDocument(): Check m_currentDesignDocument.
Fix a crash occurring when dropping a .js file onto the Widget Designer.

Task-number: QTCREATORBUG-15903
Change-Id: I3e952df1483c5683fa7daa3a1f2fb8ebbbc1b491
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-21 12:13:47 +00:00
hjk
a3b2809417 ImageView: Remove hard dependency on QtSvg headers
Change-Id: I2c8aa3017a95b36b3d96687f2da03eb2ef558222
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2016-03-21 11:42:02 +00:00