Commit Graph

8660 Commits

Author SHA1 Message Date
Tobias Nätterlund
e80c4b80fc QNX: Fix QML_IMPORT_PATH setting in shipped bar-descriptor.xml files
Include the path to /usr/lib/qt4/imports, to allow e.g. QtMultimediaKit
to be found, as it's installed there

Change-Id: I99815e82b8b25973d4347a0e95e1ecf7402b5d7b
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-01-21 08:10:41 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00
Thomas Hartmann
d8d5c4302c QmlDesigner.qml2puppet: using QApplication
Using QApplication instead of QGuiApplication.

Change-Id: I270877b9dfa89055c816eaa6ca8cbf8b3933abb6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-01-14 15:52:30 +01:00
Thomas Hartmann
d26ec5048f QmlProjectPlugin: replacing QmlProjectApplicationWizard
The new wizard is template based. This allows easy addition of
custom QML templates and also allows us to add more QML wizards
for e. g. components later.

This template mechanism allows substitution in comment, which
allows us to keep valid QML file as templates.

This reduces the maintance burden significantly.

Change-Id: I7766b037635131da2af5aae518d6fe4597ff8b9f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-11 14:59:12 +01:00
hjk
6313351d21 QmlObserver: remove Symbian specific code
Change-Id: Ic28d81daaa3b8378730fb5ea3810af7d748b54ba
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-11 13:50:00 +01:00
hjk
e629899766 Debugger: always prepend '::' to types when constructing expressions
Traditionally, this would have been exactly the wrong thing to do as the
colons confused gdb's command line parser. Now that the general C++
awareness has improved, the parser accepts :: but gets confused by name
lookups, see http://sourceware.org/bugzilla/show_bug.cgi?id=15008

Change-Id: I01e46643a5179ecef26fcc11eab7bab84c359ec6
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-10 17:43:07 +01:00
Mehdi Fekari
c6a21e8966 Qnx: Add templates for Cascades Applications
Change-Id: Iabe5a54c00446ff8a3562a6b3be14bf589d559a6
Reviewed-by: Wolfgang Bremer <wbremer@rim.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-01-10 16:18:35 +01:00
hjk
9035c802b0 Debugger: make QModelIndex dumper work with Qt 5
Someone renamed the 'p' member to 'i'.

Change-Id: Ifa4e06f4d4b431577010a0ef6fee0c0fd4bb09c1
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-10 14:37:13 +01:00
hjk
18121bf420 Debugger: allow plain gdb's pretty printers to be used in Creator
Change-Id: If31fe1bce75bef4f4a687c51ef57381f5083814c
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 17:54:45 +01:00
hjk
7459f8805b Debugger: allow automatic script loading
Change-Id: I65c79a5cf226f9ce73ef4cb0ae66387fc1c74112
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 17:54:38 +01:00
hjk
ecf9704b25 Debugger: support for C99 complex/_Complex type
Task-number: QTCREATORBUG-8513

Change-Id: I1241c05c18f6fa7e1f22276253419c395ae9013b
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-03 14:45:59 +01:00
hjk
de579d62b4 Debugger: add entryList and entryInfoList to QDir dumper
Change-Id: If41dd33952844223788bf0bc54245732b229fe45
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-30 14:06:37 +01:00
Eike Ziller
03717cf7ef Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
2012-12-18 17:42:04 +01:00
Kai Koehne
3306fda0e8 Add qmlscene to external tools menu
Task-number: QTCREATORBUG-7797
Change-Id: Icddb58db27f871c82468bf3a77bedc152ddf29cc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2012-12-17 14:53:53 +01:00
Kai Koehne
a57895c6a5 QtQuick2 wizard: Remove android special case
The current logic was broken (tried to search the qml files in the
root directory). Anyhow, there's no Android port of Qt 5 yet, so
let's keep it out for now.

Change-Id: Id854a6af00a15e424a79f903ea1d9272a89a66fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-14 17:17:32 +01:00
Thomas Hartmann
27742b6fc8 WelcomePage: updating video tutorials
I removed the Qt SDK 1.1 and some other outdated videos.
I added new videos from Qt Developer Days 2011/2012.
I also had to add icons new for Developer Days 2011/2012.

Removed videos:
Qt Creator! Getting the most...
Qt Quick Components
SDK 1.1 videos

New videos:
2012
What's New in QtWebKit in 5.0
Creator 101
Qt 5 Roadmap
QML Coding, Performance and Debugging: Usage of Tools

2011
Qt and Qt Quick
Qt Quick Best Practices and Design Patterns
What’s new in QtQuick 2.0


Task-number: QTCREATORBUG-8432
Change-Id: I5cf2a981d156a6825cda97e9bc7729b73c7350da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-14 15:05:02 +01:00
Eike Ziller
a8a33b9a3b Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
2012-12-14 08:20:49 +01:00
Thomas Hartmann
71a0daa11c Welcomepage: Do not limit the vertical size of the example browser
I kept the limitation to 3024 pixels to keep the patch small
and avoid accidents/regressions.

Task-number: QTCREATORBUG-8411
Change-Id: I1e2fc453500358d67bdb62732adcdc8e7fa17e1b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-12 11:35:27 +01:00
Thomas Hartmann
0ffb029a81 QmlDesigner.propertyEditor: cleanup of FontGroupBox
Creating a proper interface for all the single dot properties.
This is easier to read and allows usage in items with a different
name for the font property.

Same fix for FontStyleButtons

Change-Id: I3d6b9ab6c9ccd5ffc1f7d06bf3f528df7ddb030d
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-11 14:45:57 +01:00
Thomas Hartmann
b610c152b9 QmlDesigner.PropertyEditor: fix image filter
Change-Id: Ia08ce1e955ff82f62d9bb37baa27933592c78448
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-11 14:38:03 +01:00
Orgad Shaneh
6e7b51f941 Qml2Puppet: Fix compilation with qtdeclarative master
e0cb13a5 - Move no-Gui related QML types from QtQuick into QtQml
55f6a109 - Renamed QQuickItem::pos property to position

Fix some warnings

Change-Id: Iec9fe3f543f900a177d55c5de3a636bb296cbc49
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-12-10 11:27:46 +01:00
Thomas Hartmann
007045c6bc QmlDesigner.PropertyEditor: fixing RectangleSpecfics
Disabled labels look bad with Windows Style.

Change-Id: Iaedb954db7b6b09cad19d9c748d16c440dc5bdf7
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-07 15:49:20 +01:00
Thomas Hartmann
615262d3d8 QmlDesigner.PropertyEditor: fixing import for BorderImageSpecifics
Change-Id: I0fd45cc931022d5ce26a9cadb79e539fe756064f
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-07 15:49:13 +01:00
Thomas Hartmann
2f0936a1b4 QmlDesigner.PropertyEditor: adding missing functionality
Adding missing functionality from FileWidget.

Change-Id: Icc2237039cdcaf49d39bd714928dcf88ce797f14
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-07 15:48:43 +01:00
Thomas Hartmann
a8c154b82a QmlDesigner.PropertyEditor: proper disabling of IntEditor
We do not want to "disable" the lable.

Change-Id: I6d7c42458d19d05e0934ac63c70198798c8aec8b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-07 15:48:37 +01:00
Thomas Hartmann
37fb8fa027 QmlDesigner.propertyEditor: exposing checked in CheckBox
Change-Id: Ibb7c74124235721b0e9973e1596564117028b81b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-07 15:48:31 +01:00
Marco Bubke
0b3eb65fc9 QmlDesigner.NodeInstances: Workaround for property cache
The property cache in the engine is causing a crash if entry is destroyed.

Change-Id: I8bb058b3ae7c8f0c65f1b8f07676ed128e4789d3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-12-05 11:29:57 +01:00
Eike Ziller
d719eebfdc Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
2012-11-30 17:02:35 +01:00
Kai Koehne
c6e47403c4 Fix chinese translation file
Got broken in cb18283dd8.

Change-Id: I402f2efa711b6dc42d5d6363b07a98560c942e33
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-30 15:43:01 +01:00
Jing Bai
cb18283dd8 update the Simplified Chinese translation file
Change-Id: I39b8284f77eb0420e63e752d7dd8881d24133d09
Reviewed-by: Liang Qi <liang.qi@digia.com>
2012-11-30 11:44:11 +01:00
Marcel Krems
297afe3b01 Copy plugins to correct user directory under Unix.
Change-Id: I587154926a5e4bce62984445d7a00547c0b51673
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-29 10:45:58 +01:00
Thomas Hartmann
e64661d4bb QmlDesigner: renaming file from .qml to .template
Reason: Since they are templates they do not have
proper QML syntax.

This change avoids warnings in Qt Creator about
syntax errors in .qml files.

Change-Id: I9194576851a0ea988dcf8bd340564d6563240707
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-11-28 13:16:04 +01:00
Sergey Belyashov
5b1bee4d5d Updated Russian translation
Change-Id: I41db815a7759b75b08c0bc04b948973f6bc24df3
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-27 19:14:15 +01:00
Eike Ziller
ba1d5f2cdf Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	src/plugins/cpptools/cppchecksymbols.cpp
	src/plugins/texteditor/behaviorsettingswidget.cpp

Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
2012-11-27 11:50:56 +01:00
Kai Koehne
62b20005dd Split up QML Extension wizard in Qt Quick 1 and Qt Quick 2 one
Task-number: QTCREATORBUG-8269
Change-Id: I6b4a4d54499302354606f9446f68b9088daad1e8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-11-26 14:15:12 +01:00
Kai Koehne
536bea2d9e QmlExtensionPlugin: Fix compilation with QtQuick1/Qt 5
Change-Id: Ib3899f8097c97114baeca0fe7c9b6ac4ba78dbde
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-11-26 14:14:35 +01:00
Eike Ziller
387f5a7006 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
2012-11-26 10:52:28 +01:00
Thomas Hartmann
8af523cba2 QmlDesigner.PropertyEditor: adding support for url
Now url properties get a nice file browser when the sheet
is generated.

Change-Id: Ife4ab3081d92a5ccfab3c3d529de12c22f98d51a
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-11-22 15:46:47 +01:00
Thomas Hartmann
ccd8b92c31 QmlDesigner.PropertyEditor: move template definitions from C++ to QML
Moving the template defintions for property types from C++ to QML.
This allows supporting more types by just editing TemplateTypes.qml.

Change-Id: Ic93a36067ac4a5e2736005b762b4ca4b7beb7cf7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-11-22 13:18:04 +01:00
Marco Bubke
abb7bb7880 QmlDesigner.NodeInstances: Use new designer support interface
Change-Id: Idfca7ea37f29df3c60b4a0eacd2b9ef80bbf5754
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-22 12:54:08 +01:00
Thomas Hartmann
187e423546 QmlDesigner.PropertyEditor: refactor QML file structure
All the "helper widgets" are now a plugin called HelperWidgets.
This allows reuse of these widgets from other places.

The QtQuick directory now really contains only the QtQuick specific
items.

Change-Id: I99dbbe43b25ee8631b6bb1effe993f951e19a8db
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-22 12:26:35 +01:00
Marco Bubke
1b23a4a410 QmlDesigner.NodeInstances: Fix color reset value
There is the color property with the r, g, b, a sub properties.
Before this change we only saved the default of the sub properties.

Change-Id: I11d4b0ed83cf8469836099a4f65942d7e8c8d8a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-22 12:16:07 +01:00
Thomas Hartmann
8629043061 QmlDesigner: remove Qt import legacy code
The directory was called Qt for legacy reasons.

Change-Id: I8e682961bf9960d7d7c94d1a3a4aa4fbffb35ccd
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-11-21 17:51:28 +01:00
Marco Bubke
7ef1f9d124 QmlDesigner.NodeInstances: Deactivate componentComplete in VME
Change-Id: I18c80e0a6d3206ff863b0466d43375fdb64a6b80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 16:11:22 +01:00
Thomas Hartmann
960801b52c QmlDesigner.instances: fix for QmlPropertyCache
Setting the original parent to preserve data constructed from
the VME.

Change-Id: Ib3c31e129e2f25affee37c97f725c6bfe3fb0286
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:59:52 +01:00
Thomas Hartmann
bd67bd8d63 QmlDesigner: meta object fix
Change-Id: Ia5db0c5293eaf07d5141054f921a80987076532e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:59:25 +01:00
Thomas Hartmann
091d1116a2 compile fix for qml2puppet
Change-Id: Iad3c36e66e70c4ba1c885ffc10c4ea3f888aa820
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:27:04 +01:00
Marco Bubke
1600f55f62 QmlDesigner.NodeInstances: Disable text cursor
Change-Id: Ib27752624d658096903dc3b2660f2ee199d7869e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:23:20 +01:00
Thomas Hartmann
74d0ba65e1 QmlDesigner.propertyEditor: fixing color editing in Qt5
In Qt5 color does not implcitly get converted to string in QML.
Since this was never a documented feature we just adapt the
codein the property editor and convert color to string explictly if
needed.

Change-Id: I6b2b1dc356d2ec1c806c77450f49e793def2f5bb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-11-21 15:19:00 +01:00
Marco Bubke
1fdd172772 QmlDesigner.NodeInstances: Add debug output
Change-Id: I97ae422fce73ef3df62a66ef4bb925454176f891
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 14:12:40 +01:00