feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
54,723 Commits 108 Branches 368 Tags
41df91ece8e2d88fabbaf00b2074b810ba93b51a
Commit Graph

5173 Commits

Author SHA1 Message Date
hjk
e1f8ed7384 Debugger: Sort out the 'address' vs 'origaddr' fields 
Now 'address' always refers to the address of the object or
field mentioned in a WatchItem whereas 'origaddr' is
optionally used for the address of the pointer (not its
value) pointing to the object/field in case of "autoderef"
pointers.

Change-Id: I718eb13e6147dafca016c85db6c8b31c631cc764
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-08 17:29:06 +01:00
Robert Loehning
5a27d2ed46 Update German translations again 
Change-Id: Ibd224599be984f9d4a0e7c0ee643cb9c7d3e6065
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-03-08 17:25:23 +01:00
Eike Ziller
f60873a24f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
 2013-03-08 11:39:33 +01:00
Thomas Hartmann
c98be07fdb QmlDesigner: remove unused .pro file 
Change-Id: I5ef1a6cbc56dad2b9264827c9b001676716dedda
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-06 18:20:42 +01:00
Thomas Hartmann
db486783a9 QmlDesigner: compile fix for share qmlpuppet and Qt 5.1 
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900

This ensures that QWeakPointer(const QObject *other)
does not get ambiguous with Qt 5.1.

Change-Id: I4801dbbc0ca4a3779b06d388f6a4251399f3e14b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-06 18:12:46 +01:00
Thomas Hartmann
18ad2973ba QmlDesigner: fixing .pro file for mac 
The relative path is not correct on Mac for deployed packages.

Change-Id: I379f3d986df118495763811617ffe1a2cfe623ec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-06 15:41:04 +01:00
Marco Bubke
b3c82d3afb QmlDesigner: Fix compile warning 
Change-Id: I32665d8a9aadb7c3dec7f839477abe084ec66287
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-06 15:14:56 +01:00
Marco Bubke
29bef4c280 QmlDesigner: Fix byte padding 
Change-Id: I6c7562883e9ade627fad4cdf553765e164ceaf81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-05 12:47:10 +01:00
Thomas Hartmann
ee4bf638ca QmlDesigner: Type of the propertyname is now PropertyName 
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-05 12:34:39 +01:00
Sergey Belyashov
8ee43eeb1a Russian translation update 
Change-Id: I889672927ee57f2eb5e392e3002a4d2a5539be15
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-03-04 18:09:39 +01:00
Thomas Hartmann
ba78b73f41 Welcomepage: fix combobox for Qt 4 
Somehow AbstractItemModel is not registered in Qt 4.
So we cannot use the qtVersionModel as a property.

Change-Id: Iac822998cb660d317e2b750dde9f3207c66f5feb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-04 17:51:40 +01:00
Friedemann Kleint
cf2ddce7ef Update German translations after string freeze. 
Change-Id: Ie883243a3c818386307424f8c9dbea4ec1b7e6a8
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-25 14:59:46 +01:00
Joerg Bornemann
1cd140ae25 fix syntax errors in qmlproject files 
Change-Id: I2f559a2dc3af6adc41e417ad2b5d4a5ac8c47f0d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-25 12:15:51 +01:00
Oswald Buddenhagen
27de678783 Merge remote-tracking branch 'origin/2.6' into 2.7 
Conflicts:
	share/qtcreator/translations/qtcreator_uk.ts

Change-Id: Idedbd2dd847e7429e5455eddabc0b7e191dcb703
 2013-02-22 09:45:06 +01:00
Pavel Fric
619e52ebc2 Update Czech translation 
Change-Id: I7dc1d53fb4b8043742a8fa739e18c33fe9cc5c55
Reviewed-by: Vojtech Kral <vojtech@kral.hk>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-02-22 09:35:21 +01:00
Fawzi Mohamed
942326ae9b qmljs: add infrastructure handling qml dialects better 
QmlBundles enables us to treat the different qml
dialects differently.

Add imports completion.

Change-log: [Qml/JS Support] Corrected handling of QtQuick2 only features.
Change-log: [Qml/JS Support] Added import completion in editor.
Task-number: QTCREATORBUG-8750
Task-number: QTCREATORBUG-8624
Task-number: QTCREATORBUG-8584
Task-number: QTCREATORBUG-8583
Task-number: QTCREATORBUG-8429

Change-Id: I1384b1b23136a85b4d077895ea86f92960da9e71
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-21 17:22:16 +01:00
Maurice Kalinowski
c9d7b396e5 update wizard template 
- on Windows the export is required, while on Unix everything
  gets exported by default.
- for Qt5 based Qt Creator we need the specification of the
  json file.

Change-Id: I1e8055fcb2b81d42369f906e1ba42a4c2b811553
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-20 09:39:58 +01:00
El Mehdi Fekari
ef6a9d06f4 Qnx: Add BB10 style to the BB QWidget-based app templates 
Change-Id: Iff25302043b4f6078f9a147e52ebde7624aa7585
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-02-19 20:11:08 +01:00
Tobias Nätterlund
e96b735e0f QNX: Remove BlackBerry specific Qt Quick wizards 
As the standard Qt Quick wizards can handle BlackBerry
file paths for the QML files, and the
BlackBerryDeployConfiguration automatically sets up a
bar-descriptor.xml file for the project, we can remove
the BlackBerry specific Qt Quick wizards.

Change-Id: I8866fb92c8b1725fb4d4ba7af6bdaa2e15986eb2
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-02-19 07:44:45 +01:00
Nikolai Kosjar
660afe2a63 Editor: Add snippet for main function 
Change-Id: Iec778663351a866432a215cb9ab90d6261763141
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-19 01:25:13 +01:00
Victor Ostashevsky
733f05b27a Ukrainian translation update 
Change-Id: I47fd0044ec73b45bbbcf4545eee1d2a8a9bacd94
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-02-18 10:14:30 +01:00
Thomas Hartmann
edaa6bcd12 QtQuickWizards: remove ugly icon 
No icon is better than an ugly icon.

Change-Id: I58aa148c47ede82f396edb9c8cb1599521f9cf04
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-15 14:07:00 +01:00
Kai Koehne
1e988331d0 Fix Creator plugin wizard for source file extensions 
Task-number: QTCREATORBUG-8753
Change-Id: I3a099b9b78a96eb1d19ca2f92e29c951591c7e60
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-02-14 13:03:16 +01:00
Robert Loehning
986fc8bfc9 Fixed empty German translations 
Change-Id: Idd08f6aa03a39adc05dc9a8056a269557d5c4440
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-02-14 11:26:01 +01:00
Friedemann Kleint
2efcd461ad Update of German translations for 2.7 
Change-Id: I199c3576cc6b0ec1fc9cecd969a64b43ed272a62
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-14 10:27:13 +01:00
hjk
a4f7d5082a Debugger: Fix or disable remaining dumper auto tests 
Now all dumper autotests pass on Qt 4 and Qt 5 to get a base line
for testing. The intention is to re-enable the disabled tests,
especially the QObject related ones soon.

Change-Id: I18236c86145f7d1fb1ed347e2079d15af086a129
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-13 16:00:01 +01:00
El Mehdi Fekari
87af50d925 Qnx: Use BlackBerry logo as icons 
Change-Id: I24a142aeb6ebba60b4522a0b7dec25952586efda
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-02-13 14:20:39 +01:00
Friedemann Kleint
ea0d68f7d4 Qt Designer custom widget wizard: Write plugins compatible with Qt 4 / 5. 
Generate plugin metadata for Qt 5 or plugin export for Qt 4.

Change-Id: I9888ebb22204c96755f82efc0dd2bceb51a19b0c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-02-13 13:45:43 +01:00
Tobias Hunger
3f85291282 Add snippet for Q_PROPERTY 
Change-Id: I7dd40f8da1ebd108748eb89fc84f7fbfce90e36b
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-02-12 15:43:43 +01:00
hjk
2b8fe600a8 Debugger: Fix QObject dumper auto test 
Change-Id: I722bcaf2f46da132b3c15d9be9bdd87f17cd01a3
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-12 14:39:05 +01:00
hjk
b0fce02f1c Debugger: Fix QLocale dumper and autotest 
Change-Id: Icf304a2fee681622b4126ddf5b373f0dfd3e03ac
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-11 17:08:53 +01:00
hjk
32f6136e50 Debugger: Fix std::wstring dumpers 
Change-Id: I16bc987a71978012a8a4faec8a7f2055412c97f5
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-11 16:04:45 +01:00
Orgad Shaneh
cf1099628f Update generic highlighter definitions 
Sources:
* Autoconf - http://opendesktop.org/content/show.php/Autoconf+Language+Support?content=76815
* All the rest - kate repository

All licensed under LGPL

Change-Id: I7878276d131bbbccf082d272a1f58d8dda1820d7
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-02-09 18:24:32 +01:00
hjk
28b9f0f3d6 HTML5: Make wizard work with Qt 5 
Change-Id: I465cb1ae5fa94cc81441d45ac4e0afe1d9245fa8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-08 12:45:16 +01:00
Thomas Hartmann
efb68b0938 QmlDesigner: fix compile for qml2puppet 
Change-Id: I3fdb693d66eafc85357da138570d58586a57e592
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-07 12:45:02 +01:00
Sergio Ahumada
fb3b01d888 Replace com.nokia.qtcreator with org.qt-project.qtcreator 
Task-number: QTCREATORBUG-8189
Change-Id: I1c882f55eed901620ef4944bf1789645b7cff34a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-07 12:40:37 +01:00
Oswald Buddenhagen
ba3c84e12b Merge remote-tracking branch 'origin/2.6' into 2.7 2013-02-07 10:17:48 +01:00
Tobias Hunger
2c61945104 Fix warning about different types used in comparison 
Clang complains about this.

Change-Id: I7c035fe09a76ce57089d3f6dbf72eea96d31435a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-02-06 16:52:01 +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
Oswald Buddenhagen
90fdd98387 make sure that new files are treated with lconvert as well 
Change-Id: I9d0946e665f74571f6fed1c467311f3658cce01e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-02-05 12:36:30 +01:00
Sergey Belyashov
334be9ff55 Fixed Debug and Release configuration names in Russian translation 
Fixes QTCREATORBUG-8686

Change-Id: Iacad5676014cd9033decdd388d87690be4a79c5d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-02-05 12:18:53 +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
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
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
hjk
13f3a6a5a0 Debugger: Fix QDateTime dumper and auto test 
Change-Id: I1e71fdda85d791f76b8300fd1301f08e6d1bab71
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-01 15:15:07 +01:00
El Mehdi Fekari
1a0bed277d QNX: Use QtQuick2ApplicationViewer for BB Quick 2 app templates 
Change-Id: I7b5029856bcba23e89a5ff83a5ae62906d1dbbe1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-02-01 14:22:08 +01:00
El Mehdi Fekari
fe10c7aa1e QNX: Use QML_INSTALL_QML variable for BB Qt5 app templates 
In Qt5 the qtquick modules/qtdeclarative plugins are installed in the qml folder

Change-Id: I023e479df529a5f69fb9898389a2f130da3af59b
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-02-01 14:15:20 +01:00
Robert Loehning
2c7347b8ed Updated license headers 
Change-Id: I3ff71d3a686453e92ba8724e75a1879f48653d11
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 13:30:48 +01:00
hjk
54d662c2cd Debugger: Fix QDate and QTime dumper and auto test 
Change-Id: Iaf4cee3099a6745c5ccc42362463ec5203f8bfb0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-01 12:33:29 +01:00