Commit Graph

27573 Commits

Author SHA1 Message Date
Christian Kandeler
d53454960d QbsProjectManager: Tell qbs where to find plugins and modules.
Without this information, qbs cannot work at all.

Change-Id: Ib99193fb38649e0bb5bbb8392ce378a6cd28a344
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-06 14:33:30 +01:00
Christian Kandeler
d4b6392f5e QbsProjectManager: Adapt to qbs API change.
qbs::logLevelTag() returns a QString now.

Change-Id: Iacd94a93bbadb30d624b9c458899921f0e72de66
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-06 14:27:14 +01:00
hjk
edfd651f87 Show summary when using -profile command line option
Change-Id: Ieeec4be993b1c53a59407349d365a6aaf1a92e32
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-06 14:19:44 +01:00
Robert Loehning
ec1d081178 Squish: Fix hooking for multiple kits
Change-Id: I5389d6aadd39f6c7f7ca6a74e006b110373eee28
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-02-06 13:49:14 +01:00
Tasuku Suzuki
ada9d1628e install qml files to the same path as target.path
An app with Qt Quick {1,2} Application template is installed under /opt/
and there is no easy way to change the installation path.
This change allows users to set installation path in the main pro file.

Change-Id: I0325c54187f781b1ceaaddfd41e913117fa445e6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-06 13:21:52 +01:00
Thomas Hartmann
a17f96d42a QmlDesigner: Fix crumble bar
Change-Id: I8eefba1b5b9839b28be5dbae379366714f40ed27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-06 13:14:43 +01:00
Tobias Nätterlund
66ddcb54c2 QNX: Finding the local executable path now uses BuildTargetInfoList
This is the same as what the Remote Linux code does.

Change-Id: Ieabf59ce64f8991ddaa1c24cd5f2dbc7098e7b26
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-06 12:53:43 +01:00
Nikolai Kosjar
32e83ef89d C++: Use camel case style in quick fix name.
Change-Id: I6f5f1f276cd0ede39be4022fc417ecf40fa30004
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-06 12:26:59 +01:00
Nikolai Kosjar
608745078d Doc: Document recently added quick fixes.
Change-Id: Ibd8ca7b8f87e541c189b2631dcd2f07026035550
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-06 12:21:30 +01:00
Christian Kandeler
85387c07e3 QbsProjectManager: Adapt to qbs API change.
Logging API was updated.

Change-Id: I78ce4bfeb441d6b496c3331aebf924e7dc81b9c7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-06 12:19:16 +01:00
Robert Loehning
2c87264336 zeroconf/dnssd_clientstub: avoid possible null dereferencing
Moved check for NULL-pointer earlier

Change-Id: I764bd3c6c0545e7fa0784327375cdf7d06b29a31
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-02-06 11:47:16 +01:00
hjk
930a2e160c TaskHandler: Use named property to store handler in action
Change-Id: Ia946bcca0a1143b00d8a4ab2a71b2bd0f894aad8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-06 11:43:54 +01:00
Leena Miettinen
281eb3d414 Doc: adding notes to bookmarks.
Fix capitalization of the new UI text.

Change-Id: Iedca6d494efad25f71a6143dd353dc369d93bec5
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-02-06 11:43:44 +01:00
Leena Miettinen
419c6de735 Doc: replace deprecated QDoc commands
The \i and \o commands were replaced with \li and
\bold was replaced with \b in QDoc for Qt 5.

The \input command was replaced with \include in the docs.

Change-Id: I257d1bebb8ebc739ca20e0d29fcf0406ecb14534
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-06 09:44:18 +01:00
Oswald Buddenhagen
276320caac make doc generation work cleanly with both qt4 & qt5
qdoc does not expand variables in include() statements, so we need to
use separate top-level "switch" files.

Change-Id: I3152baa36cb3dee055abdc68c046b445f92e1fb9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-06 09:40:03 +01:00
Thomas Hartmann
4cf407252c QmlDesigner.ItemLibrary crash fix
Since we support Qt Quick 2 and 1 force
import is ambigous and does not make sense.


Task-number: QTCREATORBUG-8560
Change-Id: I49491215e1f2ea6ef8284b0f5f5793ff4e70dea3
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-02-06 09:34:00 +01:00
Thomas Hartmann
4efe810599 QmlDesigner.ComponentsPlugin: adding .json file
Change-Id: I49c9aa68b3837fd979cf355c5585fb0ccbbac1d9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-06 09:32:42 +01:00
Thomas Hartmann
584df05a8b QmlDesigner: adding plugin for components
Change-Id: I88f911226a1e08a5455a3fc5e06529fdd04a95dd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-05 16:50:12 +01:00
Thomas Hartmann
966292b78b QmlDesigner.NodeInstances: detailed error for missing puppet
Since we will not ship qml2puppet with all version of Qt Creator,
we need a detailed error message.

Change-Id: I5b3f1475ce0c77253e318712897a39cea774bb60
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-02-05 16:15:08 +01:00
Thomas Hartmann
a574edb312 QmlDesigner.DesignDocument: fixes delete and cut
For deleting Items we need a QmlModelView to delete
dangling property changes.
In the past we "missused" the FormEditorView.
For now VewManager will expose the form editor as
a QmlModelView.

I also cleaned some includes and removed debugs.

Task-number: QTCREATORBUG-8650
Change-Id: I22ca7c5f741324532e81918571be39babd12d2e4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-02-05 16:08:25 +01:00
Thomas Hartmann
811e05f864 QmlDesigner.PropertyEditor: expose version to QML
This allows property sheets to take the version number into account.

Task-number: QTCREATORBUG-8681
Change-Id: I22a99fd30ba42572f070f67a56bb24fd1a04275f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-02-05 15:57:04 +01:00
Marco Bubke
b0c9b26375 QmlDesigner: Rename function
Change-Id: I5f7ce747e112f2757a1d016b8a1cd9fb1d4f5827
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-05 15:19:37 +01:00
Marco Bubke
afcd5c8424 QmlDesigner: Remove superfluous connect
Actually it was connected originally to a empty slot.

Change-Id: I314938110e28c5601f4a6e46c6982053d864e776
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-05 15:11:40 +01:00
Thomas Hartmann
9a05a0e7dc QmlDesigner: compile fix
Change-Id: I1010276ef8cc0ad6affd068d9d036ef6bc36de72
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-05 15:11:26 +01:00
Sergey Belyashov
112e97e81d Added comment for "Reset warnings" button
Translation for button and for dialog title may be different.

Change-Id: I603df990c074bb40a8a895c7e630587d0aa89aed
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-05 15:03:56 +01:00
Marco Bubke
7456fa239a QmlDesigner: Refactor designmode widget
Change-Id: I5a84408333afb8e6043f76eb0b9f028d8d78e2f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-05 15:00:11 +01:00
Oswald Buddenhagen
89efd76c2c de-duplicate qdoc command construction
Change-Id: I83de381cbbee9a04432aeccbb202a13f746ef97e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-02-05 12:38:24 +01:00
Yuchen Deng
79e8f88536 Git: Fix log encoding
We should using "i18n.logOutputEncoding" as we can.
In default, it should be 'utf-8'.

Change-Id: Ic5af2869e5fd5273a712f28e8e59149a4c2ef2b7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-05 10:50:12 +01:00
hjk
b612e9b13e Debugger: Qt4/Qt5 tests
Change-Id: I210798d2cd3aa746e69d2637cc6ce51e01d5e057
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-05 02:34:55 +01:00
hjk
916d6b3048 Debugger: Make some more tests applicable to Qt 4 and Qt 5
Change-Id: Ic5cd947a88feae0a1dc121050d06cac0b4f49043
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-04 23:49:31 +01:00
hjk
66ae6cef34 Debugger: Fix QDir dumper and auto-test
Change-Id: I3dfac334e54873409e77cfc18c95cc5f27fba395
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-04 23:13:47 +01:00
hjk
7a286a508c CppRewriter: Handle std::ifstream in simplifySTLType
Change-Id: I1cdb193ac4a4a3ad9005c4445cd38406412cb058
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-04 17:15:42 +01:00
hjk
cb53e38ab2 Debugger: Work on dumper auto-tests
Change-Id: I1f0e43c8a22a1f03e9a1b97e94410af0b56415ee
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-04 17:07:28 +01:00
Christian Stenger
8485f64c6b Squish: Fix verification of compile output
Change-Id: I1c55e826a79fa0f36d2870cfcb08a325ba6408e1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-04 16:47:05 +01:00
Andre Hartmann
a9f163a449 BuildManager: Simplify "Display elapsed time after build"
Reducing line noise and improving readability.
Also rounding up to full seconds to avoid "00:00" for a build that lasts
800ms.

Change-Id: I88471ec39d233e5f67821381769550eb8c4c5dd5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-04 16:18:06 +01:00
Marco Bubke
dc2b0c490f QmlDesigner: Fix crash for in document handling
Detach rewriter for document switching.

Change-Id: I4cc710990d01b30da25609961b81b07e785a26eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-04 16:01:23 +01:00
David Schulz
78076ed8f2 Editor: Remove default for "Open Links In Another Split".
The functionality in generall is ok, but current default
behavior is not expectet, so turning it off.

Change-Id: Ibfff28e02d49269981314c9924b36f9f2d4d7740
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 15:04:05 +01:00
Robert Loehning
e91b241cce Added missing pointer deref
Change-Id: Ie06cee2659d1fd6e5e3c0ace8c03a600634f776c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-04 15:01:39 +01:00
Christian Kandeler
45fd1c248f Remove unneeded #ifdefs.
Change-Id: I66241be77f61a53590b72560fc0afce50bda97d9
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-04 14:24:16 +01:00
Thomas Hartmann
1d14e7e439 Welcompage: allow highlighting of demos and examples
With this patch the attribute isHighlighted="true" in
the manifest.xml allows highlighting demos and examples.

The highlighted demos and examples appear first in the list
and have a blue highlight.

Task-number: QTCREATORBUG-8459
Change-Id: Ieeb888630235e07b1ae1398c5ccdc3d7e8d15dff
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-02-04 14:13:04 +01:00
Thomas Hartmann
a6c8628c12 WelcomePage: add combox to filer Qt versions
Task-number: QTCREATORBUG-8377

Change-Id: I6693d4ed9cf3791e4cd791463a1b00a23dc4ffff
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-02-04 14:08:37 +01:00
Thomas Hartmann
fa3b69d7a9 QmlProjectMamanger: ui fixes for QmlApplicationWizard
Adding Proper title and description.
Setting project name as uniqueProjectName() (untitled)

Task-number: QTCREATORBUG-8679
Task-number: QTCREATORBUG-8680
Change-Id: I29227dc45cc3584f5a57642d936cac5a458535af
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-02-04 13:55:37 +01:00
Christian Stenger
675b33e832 Squish: Let tst_rename_macros continue if it fails
Change-Id: If4836259220f6439e7f2cc958ecfb19b56c94573
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-04 13:55:08 +01:00
Orgad Shaneh
a9e3db2283 Project: Only add qbs file if it exists
Change-Id: I2d49644b63bad9b7ffa7d088f443ed6ec2fc85ed
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-04 11:49:31 +01:00
BogDan Vatra
1ee3db88e3 Revert "Android: also adb pull /system/bin/linker"
It breaks the debugging on real devices.
Tested on HTC Desire HD and HTC Amaze.

This reverts commit 6fc9c0732b.

Change-Id: I378af345b186e1b4eef9997d3d8e592c43c3f1c4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:27:20 +01:00
Yuchen Deng
86075a8f0e Get the correct CMake Version
Change-Id: Ie5443c31ecf8dd7644303f5e5a2f9885a33bf3a7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:25:08 +01:00
Yuchen Deng
bc1977d238 CMake: Select arguments text for easy editing
Change-Id: I416a35a773792a1aee17811c022820262eb7f23e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:24:04 +01:00
Tobias Nätterlund
8ea3c5a413 QNX: Remove the image wizard extension for BlackBerry wizards
The icon and splashscreens are easier to configure now, with
the bar descriptor editor in place.

Change-Id: Ieaf48a5eef880c709d77af8bfc7b9e3d467c0e1e
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-02-04 10:24:38 +01:00
hjk
39e15a0efe Debugger: Work on dumper auto tests
Change-Id: I94a4ff9a2f76b1eb2aee83f4db827f7906d1e382
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 20:26:11 +01:00
hjk
cb1275fa33 Debugger: Work on dumper auto tests
Change-Id: I3df1faef35fec270094fdfbcb360216f516d0208
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 18:55:44 +01:00