Commit Graph

35759 Commits

Author SHA1 Message Date
Daniel Teske
ce1a691abe PluginManager: Introduce a getObjects() function taking a predicate
Change-Id: I8a822d76a3dc358de48e96801e4e531f3bbb8669
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-12 14:54:36 +02:00
Thomas Hartmann
248964789a QmlDesigner.PropertyEditor: Allow abitrary anchor targets
QTCREATORBUG-12077
Change-Id: Ifce1587235c81da56da6bc5788081cc1711d1bdb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:43:52 +02:00
Thomas Hartmann
d8647b9cc3 QmlDesigner.PropertyEditor: Fix text for CheckBoxes
We need to set the text to the value, so that the user can see which
value is explicitly set.

Task-number: QTCREATORBUG-12195
Change-Id: I0b405839122f3b008790df3e3c2b0b7728299b7a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:42:39 +02:00
Thomas Hartmann
7d2f919f48 QmlDesigner.PropertyEditor: There is no passwordMode on TextField
Change-Id: I7b8c9ea09ace69f66f8fd1cc5128d92418250fde
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:42:28 +02:00
Christian Kandeler
d0b25af07b Valgrind: Remove unused function.
Change-Id: Ia14634a95e8227b65719052482dec9e9fd456877
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-12 13:54:02 +02:00
Daniel Teske
cf8cae595c PluginManager::getObject(): Remove special support for aggregates
Since no one is using it and it's faster this way.

Change-Id: Ib60d3a54aed98011b2fb4bb7d159e219abebfa7e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-12 12:29:00 +02:00
Eike Ziller
e90b0c128e Android/Ant selection: Work around file dialog bug on Mac
Task-number: QTCREATORBUG-12184

Change-Id: I2cb7c1549fc2201d4fbe163eb321b0ef11cc8a06
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-12 12:12:45 +02:00
Tobias Hunger
01d9e4d70b Android: Fix warning about hidding overloaded virtual method
Change-Id: I5787af2620565f759ee2e739d1458e3f0cf63f2b
Reviewed-by: Wiebe Cazemier <wiebe@halfgaar.net>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-12 10:53:16 +02:00
Christian Kandeler
2538b610c2 Valgrind: Don't use QString::fromLocal8Bit() on remote output.
Instead, assume UTF-8, which is very likely to be correct for a remote
Linux system.

Change-Id: I2976e2d79bf10d4db23f60f2c6c9fddffa58a9b7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-12 10:47:18 +02:00
David Schulz
adb5a7a708 Editor: Set correct title to the print job.
Fix proposed by Alex Sokolov.

Task-number: QTCREATORBUG-12161
Change-Id: I1a7d4e9579dbb518970ea7bdb76a740e8e5d870d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-12 08:19:41 +02:00
Fawzi Mohamed
77ec2c6c2c qmljs: add qbs default paths
Change-Id: I7925c9e7e0931a35333965faba1a3e65129584bd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-09 17:13:23 +02:00
Fawzi Mohamed
58489e50a8 qmljs: better defaults, more uniform handling of paths
Uniform handling of the different qml dialects.

Now paths for a given document prefer the project of that document.

For Qt the following sequence is used:
- Qt of the project of the document
- Qt of the active target
- Qt used to run creator

Currently all paths of the open projects are still merged, but that
can be changed.

Change-Id: Id302c13c893b66fbfe24e301602fe69de152eed4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-09 17:13:05 +02:00
Robert Loehning
372fc953cd Squish: Fix createTasksFile()
Change-Id: I437d9e59723556363e233e939032630246981874
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-09 16:04:15 +02:00
Thomas Hartmann
7206c0b020 QmlDesigner.PropertyEditor: Adjusting minimum size for Window
I also fixed the maximum size.

Task-number: QTCREATORBUG-12209
Change-Id: I8a7be267525f8ffd54cb79aecead26edd76c101d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-09 15:48:33 +02:00
Thomas Hartmann
675a059671 QmlDesigner.PropertyEditor: Using regExp instead of inputMask
This does work as expected.

Task-number: QTCREATORBUG-12018
Change-Id: I1ae4c2f9c222ffcc68a81ab545fe19ac253b0dbb
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-05-09 15:35:43 +02:00
Alessandro Portale
df6337f986 Qt Quick Designer: QStringLiteral vs. QString(QLatin1String())
We can use QStringLiteral here, since Qt Quick Designer is not
built with Qt4.

Change-Id: I776a1453905d90dc68e821c4898acfd3ad574dcd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-09 15:06:57 +02:00
Christian Stenger
085469b894 Squish: Enhance tst_codepasting
* set a random expiry for the paste
* make sure server side errors are handled

Change-Id: I28feab982fefbb97a9f603144943a57cc268538c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-05-09 14:05:49 +02:00
Tobias Hunger
234d66c8e4 SettingsAccessor: Simplify code
Change-Id: I9391ad1c6f71a795dbea73b1412bf29d3b038c2e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-09 13:48:40 +02:00
Tobias Hunger
c3906f5365 SettingsAccessor: Factor out issue reporting
Change-Id: I4855fc2c4b3303d6d44d025589117e08bb577aef
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-09 13:46:10 +02:00
Robert Loehning
1e3f150857 Squish: Force English in suite_tools
Without, I get German output from git which breaks tests.

Change-Id: Ic12a3d31908193b4bac3283eb02b06fc945c5fd8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-09 13:43:28 +02:00
El Mehdi Fekari
761c412181 CMake: Provide generators for Qnx/BB kits
Task-number: QTCREATORBUG-12210
Change-Id: Ie7cd3e9f95b823d166ad83018ec3199068132e5e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-09 13:06:06 +02:00
Tim Jenssen
de353520a5 QmlDesigner: remove old unnecessary work arounds
Change-Id: Ic864ff707e942fe7bba13cb29fd288ab2abfc913
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-09 11:17:23 +02:00
Tim Jenssen
f449d1a823 QmlDesigner: remove unused signal
Change-Id: Iff710bcc666db41ef89d4912f8136bcf3ca4eb0c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-09 11:17:09 +02:00
Tim Jenssen
1cbea9ce92 QmlDesigner: add reload feature to stateseditor
Change-Id: I61fc9fb05dc901765c1c348cfab29b3d2eaa7516
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-09 11:16:59 +02:00
Christian Kandeler
48629270aa Update qbs submodule.
To HEAD of 1.2 branch. Pulls in a number of bugfixes.

Change-Id: I9aae39b9dd5aaa236ad0e8f50150e85b85eb06fc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-05-09 09:58:52 +02:00
Alessandro Portale
551f7e1caf QString(QLatin1String()) -> QString::fromLatin1()
Change-Id: I93bdd926ca1c7a37a298335711069d985f1f91dd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-09 09:03:19 +02:00
hjk
5cb7bd51f4 Debugger: Fix Eigen dumpers, again
This time with autotests.

Task-number: QTCREATORBUG-12193
Change-Id: Id91eecd38eb4ac76c68be8e9969651407a68ebf4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-09 08:51:41 +02:00
Christian Stenger
0c4b9455b6 Squish: Add test for external modification
Additionally moved common code of tst_*_externally to project.py.

Change-Id: I056e0dc6749cf92e1416ce313a8f058639981609
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-05-09 07:39:53 +02:00
hjk
6c244fb010 QmlDebugger: Compile fix with Qt 4
Change-Id: I4b7187c150db63c1b24883a159cbe3019a4e2e6f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-08 18:41:04 +02:00
Tim Jenssen
5c2c3bab1b QmlDesigner: use better reload shortcut
- an installed QShortcut just eats the shortcut
   so use something more none common

Change-Id: Ibaa898f9e7c979fd6a149f2a56252267bd93ef2d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-08 18:14:04 +02:00
Tim Jenssen
57ac84544d QmlDesigner: cleanup getting propertyEditorQmlSources path
Change-Id: I4a1a8e9d509c8a5357cf98213f41ad70dbd85e3e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-08 18:13:57 +02:00
Orgad Shaneh
60cd217981 Valgrind: Support console applications
Task-number: QTCREATORBUG-7311
Change-Id: I973136076118fd8868c6cb461ad31e107c73566e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-05-08 17:52:27 +02:00
hjk
3089c8b1df QbsProjectManager: Remove some unused code
Change-Id: I5e77f5daeb8d7200e333443b0912c5be6e3b9f81
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-08 17:51:47 +02:00
Marco Bubke
fcdb3373b1 QmlDesigner: Fix warning
Change-Id: I8434c80668a04b5bf5f0b526bdb21f5a03c1c151
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:43:45 +02:00
Marco Bubke
e64d0b5a39 QmlDesigner: Cleanup navigator.h
Removed unused function and forward declaration.

Change-Id: I35480b988bd30fa4067648ab8767bf627019659c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:43:36 +02:00
Marco Bubke
e3092f64cd QmlDesiger: Remove unused forward declaration
Change-Id: I74a400c2be6ea1f6c5147f32a8789e8815fe0311
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:43:22 +02:00
Marco Bubke
44770d9e73 QmlDesigner: Don't mix functions and variables
Change-Id: I045a58c2567b644034a91c606fefc4ebe83ca6de
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:43:09 +02:00
Marco Bubke
f313dc6229 QmlDesigner: Remove empty NavigatorWidget::~NavigatorWidget
Change-Id: Ib232f22d6904feab48b66badf26adc4cd1f89d3f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:42:55 +02:00
Marco Bubke
7f4e1cf960 QmlDesigner: Refactor NavigatorWidget::treeView
Change-Id: If5e1c5dbd8dd6f52bcf43d88256201a4a3c4aa9a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:42:42 +02:00
Marco Bubke
c2bdf2905b QmlDesigner: Refactor NavigatorWidget::createToolBarWidgets
Change-Id: I92003bda65077a5f1f15e34e3aec46edac852c56
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:42:30 +02:00
Marco Bubke
0f55582835 QmlDesigner: Fix wrong order after dropping a item in the navigator
The component complete command is reparenting a item so it is appended. To
get the right order the ChildrenChangedCommand should be sent after
ComponentCompletedCommand.

Change-Id: Id4c1025fc7b4d7f25a7db7511029013c24441dd3
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:42:07 +02:00
Marco Bubke
3ab900de7a QmlDesigner: Fix tooltip for navigator keys
Task-number: QTCREATORBUG-12205
Change-Id: Id24ce92057908a81b77b3f61d488eb78c1e6f9e7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:41:19 +02:00
Marco Bubke
988d631fae QmlDesigner: Remove FormEditorView::nodeSlidedToIndex
It was not called any more.

Change-Id: I05c64f11fde09b1f115f6dd4fdfd1a98d3fe3b14
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:41:07 +02:00
Alessandro Portale
f3833907df WelcomeScreen: Remove unneeded QQmlNetworkAccessManagerFactory
That was for rss support which had been removed ages ago.

Change-Id: I98eec132489713d208ac20d9744fec2e5570ee2b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-08 17:22:33 +02:00
Marco Bubke
6d192bd843 QmlDesigner: Don't reparent if the new parent property is the same
Change-Id: I5de80a9896c17e22e52b5cc1e209c728cfd5616f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-08 16:37:56 +02:00
Marco Bubke
9ae8846dbc QmlDesigner: Fix pointer return value
Change-Id: I60d6744753856c536db61484fa59a6756b9ec5d3
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-08 16:37:50 +02:00
Marco Bubke
d346590659 QmlDesigner: Handle drops of images from the item library in the navigator
Change-Id: I42c0224d5f6aadc7253113b39d7c4ababeab45fb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-08 16:37:41 +02:00
Marco Bubke
49347f3cf5 QmlDesigner: Add QmlItemNode::createQmlItemNodeFromImage overload
We need a parent property overload so we can add a item to a non
default property.

Change-Id: I2044126f1c9f4cb112d1b96db163b70cd12b9042
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-08 16:37:31 +02:00
Marco Bubke
234cc766ed QmlDesigner: Item dropping from the item library to the navigator
Change-Id: I04f3b809ce743bbeef5e3955892ab51690783942
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-08 16:37:19 +02:00
Marco Bubke
c1d521bf50 QmlDesigner: Add QmlItemNode::createQmlItemNode overload
We need in the navigator a function that takes a parent property instead
of a node.

Change-Id: Ia91c8d3e4eea87cc8f49c409eb987e3187a6b316
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-08 16:37:08 +02:00