Commit Graph

42981 Commits

Author SHA1 Message Date
Thiago Macieira
fec32126dd Fix compilation after qstringlist.h stopped including qdatastream.h
Change-Id: Ida09e794262dce78cd5169aac56b610fabc9082c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/c1be0fbe7d17b67c330c0c90eb9ba8a0536c2121)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2015-10-27 17:51:27 +00:00
Oswald Buddenhagen
89f64dc733 add priority sorting to $$resolve_depends()
all else being equal, items with a higher numerical priority will appear
first in the result.

Change-Id: I4ee37ff404a53c4152a1e4fc2fc3c23ef525234d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/26bbc40db925d7823d9cf9db80a4093eba613ad8)
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-10-27 17:51:22 +00:00
Alessandro Portale
33d3b3a2d4 qmake: Use QDir::toNativeSeparators on paths printed as info
Change-Id: I8c587164bcff742f7ac8ad3f3f28e0b16645cb2a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/01ce104a3ee3c8af68f6694840931661666984ab)
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-27 17:51:17 +00:00
Oswald Buddenhagen
c394fc9a23 fix $$shell_path() for mingw+sh
the msys shell expects unix-like paths with drives converted
from d:\ to /d/.

Change-Id: I09e25ed2c868702e5d7d8b9cc8c04cc13410eeff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/d52b00e1d3cc60c81b54a89d6da488dc4bbce384)
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-10-27 17:51:01 +00:00
Oswald Buddenhagen
9b9c4a96aa de-duplicate code
Change-Id: Ic056acf739659215241c1cab6a462b1ab591dc78
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/fb143abbfb28d8433b908b09b37b4c7720357892)
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-27 17:50:57 +00:00
Joerg Bornemann
ccbcdf89f9 qmake: add replacement function getenv
This is useful for querying environment variables which have
parentheses in their name. Such jewels exist on Windows.
The usual $$(VARNAME) syntax fails for those.

Change-Id: I1d2766cabdc7f637caa9ae6408967685e02f5029
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/b73d6be6a0723d5f886f5a8faa9123534e998331)
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-10-27 17:50:53 +00:00
Tobias Hunger
6c83796896 Wizards: Fix QmlProject wizards
Task-number: QTCREATORBUG-15242
Change-Id: Iac6829cbc805a111c0b359ed871f53b1be7053b0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-27 17:22:46 +00:00
Leena Miettinen
46cb547dcc Qt Quick Designer: make log messages more consistent
- Use sentence style capitalization
- Use human readable text instead of property names

Change-Id: Iefa6ae7d3ca1df2692699063a87fdbbf13fe0751
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-27 14:48:50 +00:00
Leena Miettinen
43aeae067e Qt Quick Designer: fix UI text
...for grammar, punctuation, and capitalization.

Change-Id: Ifcac7baa00f55ecb39ba8dba2a8f1e86667ddb49
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-27 14:48:36 +00:00
Leena Miettinen
271c6cf6db Doc: mention Qt Quick Extras in "Creating Components"
Change-Id: I9f816084e24d887a6fca5abb3689347156a26558
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-27 14:48:15 +00:00
Leena Miettinen
7ed574945a Doc: add docs for ISO Icon Browser
A commercial Qt Quick Designer plugin for
adding ISO 7000 icons to applications from
an icon library.

Change-Id: I96d740d63bc77da9817ce2d5ccdb1625dbc5caa6
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-27 14:48:02 +00:00
Tobias Hunger
0e2d153efc ProjectExplorer: Remove useless method
There are two methods to add existing files to a project. They both have
two arguments and only differ in the sequence of these two arguments.
The first calls the second. Decide on one syntax and remove the useless
one.

Change-Id: Ida7139096fa16ac746c2be837e245776506201bc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-10-27 13:40:29 +00:00
Tobias Hunger
3810a14552 Utils: Fix indention
Change-Id: Idc7ec5d102b0e3c838700ee7d89db7aea3399728
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-27 12:16:43 +00:00
Tobias Hunger
6e0e988ffd ToolChainManager: Add some basic unit tests for TC setup
Change-Id: Idf019b3f51c4cab172e92b8e208083e283530414
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-27 12:16:37 +00:00
Tobias Hunger
ac1d9abd07 ToolChainManager: Refactor toolchain restoration
This should be simpler to follow now.

Fix autodetection to return not only the newly detected toolchains,
but also those that are re-detected (taking their definition from
the alreadyKnown list passed to the autodetect method where possible).

This avoids running lots of toolchains during start-up, but still
enables us to fix QTCREATORBUG-12751

Task-number: QTCREATORBUG-12751
Change-Id: Ie74e7cffb2b014a6132cc8559db232397344f2f1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-27 12:16:16 +00:00
hjk
e5d62f3e7e Debugger: Fix of display of object addresses
Task-number: QTCREATORBUG-15236
Change-Id: Ic8f6fd60d185b759ee13dade3a18c2d955303cdf
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-27 11:45:07 +00:00
Orgad Shaneh
be43c758cb Revert "TextEditor: Default to Text style on style absence"
Breaks in-editor search results with default scheme.

This reverts commit 2c3f3970d5.

Change-Id: I4164cfdb4d6f9240b3c53846824297359a59ac52
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-27 10:54:31 +00:00
David Schulz
b9d5f62e3a Revert "Editor: Simplify Format handling."
Introduces errors with the default colorscheme.

This reverts commit a0d27fc1dccb9623b4c1bcafc915c84f5988af80.

Change-Id: I3268a9a14f10959fb71423650fd10cfe840e019e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-27 10:00:03 +00:00
Christian Kandeler
497e6d3085 Debugger: Fix attaching to remote application.
Task-number: QTCREATORBUG-15210
Change-Id: Ia78e34737e4a66c6aaa0015e85002168717d29d7
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-10-27 08:15:42 +00:00
David Schulz
763ecea5d1 Editor: Simplify Format handling.
Use setter instead of getter with references. Increases
the readability and is closer to the common codestyle across creator.

Change-Id: I3cbbd1154524da73383fbf28470ef64ebe5bc336
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-10-27 08:15:34 +00:00
Eike Ziller
d6f23d362e Editors: Fix crash when closing empty editor window
Restoring a session removes all "external" editor areas. For simplicity
the editor manager only manages the editor areas, not the windows
themselves. So an editor window must take care of closing itself when
its editor area gets cleaned up.

Change-Id: I619f95376ef980d4c318b966427ebf4b2f78ca31
Task-number: QTCREATORBUG-15193
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-27 08:03:27 +00:00
Orgad Shaneh
2c3f3970d5 TextEditor: Default to Text style on style absence
The current default is black foreground, which is invisible on dark color
schemes.

Change-Id: Id9dbc6ac7377816666887096c28fa0008291ddac
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-27 07:16:55 +00:00
Tobias Hunger
aface7b1d6 Expand CurrentBuild:Type in the wizards
This was just unset before.

Task-number: QTCREATORBUG-15178
Change-Id: Ice66273e2ce9bc60bd8a96516f774201a7a95331
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-26 16:57:02 +00:00
Tobias Hunger
6346835740 BuildInfo: Add BuildConfiguration::BuildType
Remove QbsBuildInfo, which only adds the same information over
the normal BuildInfo.

Change QmakeBuildInfo to use the buildType as provided by
its base class.

Change-Id: Iddb86487c85893988f78bbfaf549823a19f13b5b
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-26 16:56:53 +00:00
Christian Kandeler
e4517a426a Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: I7b420ba0bee813ece32becc961fde0cbe0a33f1d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-10-26 15:17:24 +00:00
Tom Deblauwe
751c8252e0 CMake: Reapply fix for finding the corresponding source directory.
It seems this fix has been removed when refactoring the CMakeCpbParser class out.

See commit a700e625ef.

Change-Id: Ia217a21d579b7b3a1478a66f9920d1b57b986b04
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-26 15:11:49 +00:00
David Schulz
1f2efb7012 Cdbext: version bump
Change-Id: I887a27bed62ec89f78130edb35527873643ea8af
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-26 14:19:55 +00:00
Eike Ziller
d4d25f65f9 Change log: Fix markdown formatting for contributor lists
Markdown needs two spaces at the end of lines to add a line break.

Change-Id: I6ded64c00dbfa649546ef70c266b22bc4d2546c2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-26 11:57:55 +00:00
Eike Ziller
26f78c3231 Changes file: Add contributors, clarify Clang code model entry
Change-Id: I6939afa8cd036b9201b56bb687ea92a82a618d08
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-10-26 10:33:03 +00:00
Leena Miettinen
0fcac3085a ModelEditor: fix UI text punctuation and capitalization
Change-Id: I4b15d727adc1fa3a082a42e9a3aae93cc092bd64
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-26 09:37:11 +00:00
Leena Miettinen
6a9588ee9b Doc: using variables in the C++ file wizard
Add a screen shot.

Change-Id: I4e89e1c2c4b0a90d80edf771ea0d831779305ed9
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-26 09:36:56 +00:00
Leena Miettinen
73ef28d4d7 Doc: using Qt Creator variables in snippets
Change-Id: I1743f9d1a49f896f50601869942b3e755bcd7f11
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-26 09:36:25 +00:00
Leena Miettinen
c8d638c250 Project explorer: fix UI text
Change-Id: Ica47a8c8e6a9b5b64c6ed5aa2a15d842803b8069
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-26 09:22:46 +00:00
Leena Miettinen
b3f601d7b6 Doc: creating relations in class diagrams in model editor
Change-Id: I6473bf364447b5c1e3caf5ca4227f9fcd4a37d8a
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-10-26 09:06:14 +00:00
Leena Miettinen
330ef13d76 QML JS: fix UI text
Change-Id: I5d1235fc7c86b12127b4b7c6392a24a4f4de84c2
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-10-26 08:37:54 +00:00
Leena Miettinen
2af989376b CMake: fix UI text
Change-Id: I6803aa799e495007358dbc5f5ee6b8e1d2c6e874
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
v3.6.0-beta1
2015-10-23 12:53:28 +00:00
Orgad Shaneh
c7717c204a Debugger: Fix "No such slot" warning in watchers
Change-Id: Ia8994e1cb86a05571a3d41352ad5d46f0bdd351f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-23 12:47:58 +00:00
Tobias Hunger
4df436f61a Algorithm: Make filtered accept a member function pointer
Change-Id: Ib71da93b3893ffb3309d00d7ce2dc803ff0eb4b4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-23 11:53:49 +00:00
Eike Ziller
d18b8507c1 Add script for packaging a directory.
Mostly 7zips the directory, all files must already be in place.
On Linux the script also fixes the Qt related RPATHs.

Changes the RPATH fixing to only change the Qt RPATH,
instead of overwriting the complete RPATH to something custom.

Change-Id: I1e07b7c0fcb4292197a4e743782a1392f6558747
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-23 09:15:01 +00:00
Leena Miettinen
d36e13b45b Text editor: fix UI text capitalization
Change-Id: I0d8d481b043973b56c6c051b8c0224349451ff26
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-23 08:06:47 +00:00
Leena Miettinen
8eebcaa5f1 Debugger: fix capitalization of button label
Change-Id: Ib83e8a8f858cb9c23752c63cb25202f69e164c30
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-23 08:06:27 +00:00
Leena Miettinen
e195526d54 Core: fix capitalization of JavaScript in a message
Change-Id: I6f3392192a57ced81f7c051fb9df2032941e19f7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-23 08:05:33 +00:00
Leena Miettinen
a2ae98557d Cpp: Add full stop to end of message
Change-Id: Idbda9e71fcd2322c2925c5dbfdca540992660282
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-23 08:05:18 +00:00
Tobias Hunger
5c4bd99715 Qmake: Remove PROFILE_BUILD_KEY from QmakeBuildConfiguration
It is unused.

Change-Id: I29ae0927a74b8f1ee6a66bf4ad99ac73e43e7170
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-10-23 07:59:45 +00:00
Tobias Hunger
66efe78b2b BuildConfiguration: Add static helper to turn buildtype into a string
Use that helper in the projectexplorer instead of hardcoding a mapping
there.

Change-Id: I8720607a869c086569661fc9e9326ed6e0f85bb3
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-10-23 07:59:37 +00:00
Tobias Hunger
ea128cd8fc CurrentBuild:Type: Do not mark these strings as translatable
They are constants that should not change based on locale. We
have the CurrentBuild:Name for something that is localized.

Change-Id: Ied7c123e0cdeee3f98ac6ea28e19137b9e70a9a8
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-10-23 07:59:32 +00:00
Leena Miettinen
b0cd8f14bc Clear Case: fix UI text
Change-Id: Ic9b0481287a30312209bc84c1190e97087495e0f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-10-22 15:07:34 +00:00
Robert Loehning
85992f823e Squish: Update tst_qml_editor for fixed editor
In 3.5, the QML editor showed two empty lines at the end of
the file. Now it's only one line so only one must be unmarked.

Change-Id: I831002e5ab9d14570d2a788010806c0b3de5614c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-22 12:09:33 +00:00
Leena Miettinen
c4872962cd Doc: add docs for model editor
Change-Id: I6bae6dc22de170c9f43cefe474e9b684675e4ff6
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-22 11:49:19 +00:00
Tobias Hunger
25e3d88834 JsonWizard: Keep "options" optional
Do not report an error if "options" are unset.

Change-Id: I53f12624275be2d8af8d38da8dfe6bfa6603b948
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-22 11:32:58 +00:00