feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
88,532 Commits 108 Branches 368 Tags
cc05c1637778db8210ea901b8da71aeef1bde05e
Commit Graph

8660 Commits

Author SHA1 Message Date
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
Robert Loehning
a040424d2a Incremented year in copyright info 
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 09:19:26 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
hjk
a839a46d4f Debugger: Fix initialization of Dumper structure 
Change-Id: Ib753cb421361abcfa1f55bc8a0d43e8aa2d43dfd
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-31 11:25:31 +01:00
hjk
5e5eb43d18 Debugger: move dumper initialization to separate method for re-use 
Change-Id: I8eb6f67ee342c88bc0f1b15874e37e130fa719a1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-31 10:30:12 +01:00
Friedemann Kleint
c0fe621127 Remove QT_BEGIN/END_HEADER, fixing compilation with Qt 5 (dev). 
The macros were removed in
07e3bcdc106ac42703ae0fb88b6cac2d2bfdd072 .

Change-Id: I4a43106ca85dc9ed97f75a4505888cb550305a8d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-01-30 18:20:07 +01:00
Sergey Belyashov
59b8c13ade Updated Russian translation 
Change-Id: I4ffbaa9dd33b5466ebc0868040ceaba804d09864
Reviewed-by: Aleksei Timofeyev <aleksei.timofeyev@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-01-30 12:26:16 +01:00
Fawzi Mohamed
18fa486531 consoleprocess: support Terminal.app on mac 
Distinguishes the process that starts the terminal from the stub
process, as on mac to support Terminal.app they are different.

Handle the stub not through the process that starts the terminal,
but through the local socket (on *nix).

Replace the blocking wait(...) in the main thread, with a nonblocking
wait in the signal handler when receiving a SIGCHLD, to leave the
main thread able to handle communication with creator.

This change allows the use of terminal emulator commands
that share a single instance or that fork.
So this is also the real fix for QTCREATORBUG-1633 on linux.

If creator crashes the stub and the debugged program live on.
This was done on purpose, it could be changed if considered better.

Task-number: QTCREATORBUG-6371
Task-number: QTCREATORBUG-1633

Change-Id: I4d4fb3a67b1987f4e46e2c603dcefe8c15152ad2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-01-29 17:56:59 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
 2013-01-29 15:52:36 +01:00
Robert Loehning
a2ae912089 Fixed Qt version in qmlobserver 
QT_VERSION_STR is being read from Qt's source directory
and may differ from the version of the build being used

See also printVersion() in src/app/main.cpp

Change-Id: Ib740c07136e1549b0cbecc8258889688763b0b36
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-01-28 12:22:10 +01:00
Friedemann Kleint
fb50278521 Fix wording in BlackBerry Wizards. 
Change-Id: I333bd4e4fa60bd46d9be499502ccf9d9b92ed2e5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-01-25 10:12:34 +01:00
Christian Kandeler
0cf4f0885b Adapt qbs project files to new installation approach. 
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-01-24 13:02:32 +01:00
Daniel Teske
1edce87173 Readd Android specific code for Qt Quick 2 template 
I tested that it works.

Change-Id: I01387c302c48f3ba9244ba40099f1dead970fb33
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-01-21 13:04:07 +01:00