feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,121 Commits 108 Branches 368 Tags
c62ad6c450df46ace5ed9e9354ed401b51a6911b
Commit Graph

46 Commits

Author SHA1 Message Date
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
 2013-04-30 11:43:33 +02:00
Fawzi Mohamed
eac15b5e7d qmljs: add explicit -relocatable flag to qmlplugindumper and use it 
This will allow changing the default to nonrelocatable.

Change-Id: I80746a3e70f94040a407cc25cec9ad6fac8b6fec
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-04-25 17:21:45 +02:00
Friedemann Kleint
225c21a0f2 Fix Krazy warnings about values or keys iteration in QML code. 
Change-Id: I78be5ec702d06ecc155842e9f092a13fc1cd6197
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
 2013-03-15 11:14:34 +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
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
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Christian Kandeler
3d9e492860 Do not use the fromAscii() and toAscii() functions. 
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.

Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2012-09-21 21:03:48 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Christian Kamm
38d90e58d0 qmldump: Fix dumping empty names for generated QMetaObjects. 
Task-number: QTCREATORBUG-6543
Reviewed-by: Roberto Raggi
Change-Id: I81af457eed14a2f863a0a92d4f5ff69c2dc48d67
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-11-17 13:54:11 +01:00
Christian Kamm
a037609c3f qmldump: Add a flush to fix output redirection problems on windows. 
Task-number: QTCREATORBUG-5825
Change-Id: Ib086e8ed213738516015334736b1a2badb202993
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-03 11:17:04 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Christian Kamm
f326bd067d qmldump: Fix creation of objects from QDeclarativeTypes. 
Previously, the import statement was not necessarily set up correctly
for the type we wanted to instantiate. We simply use
QDeclarativeType::create now and thus can skip finding the right import.

Change-Id: I545ef690dd6181f5b7a49bcb2018aaba4b60d5a5
Reviewed-on: http://codereview.qt.nokia.com/1646
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-07-14 10:47:33 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +02:00
Christian Kamm
2c40acbec9 qmldump: Fix dumping with -path on Mac. 
If the current working directory was a direct parent of the qmldir path
the exported modules had the path as the module URI on macs.

Also changes the QtQuick export back to 1.0 to make it work with
Qt 4.7.3. The version of that import statement does not actually matter
as long as it's valid.

Change-Id: Ib702356062bd239b1ad807c2592f8a69d6fde38f
Reviewed-on: http://codereview.qt.nokia.com/896
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherry picked from commit dc3e803614)
 2011-06-29 15:19:25 +02:00
Christian Kamm
6244008dcb qmldump: Improve error message for misbehaving plugin components. 
Change-Id: I7a7c4e5a0fc241a5cc6cb143df37cc63ea7711ea
Reviewed-on: http://codereview.qt.nokia.com/867
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-29 10:05:43 +02:00
Christian Kamm
14a74f336a qmldump: Fix export comparison. 
Compare the full uri/name, not just the uri. Also
QDeclarativeType::module was not available in 4.7.3.

Change-Id: I0d04d826c72d4aed5d70c3c65a1f97ad5872827c
Reviewed-on: http://codereview.qt.nokia.com/759
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-27 11:41:38 +02:00
Christian Kamm
46e970c37c qmldump: Fix for extended objects. 
Before, extended objects had the same exports as the base object
which lead to trouble.

Change-Id: Id40f0e0fd2211db95020ce224cf2c52939e68df7
Reviewed-on: http://codereview.qt.nokia.com/642
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-23 11:01:15 +02:00
Christian Kamm
4adaecda27 qmldump: Add -v option. 
Change-Id: Ia55bf314c37455647cf67f42222f7b6a483ba97e
Reviewed-on: http://codereview.qt.nokia.com/543
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-21 14:07:02 +02:00
Christian Kamm
715cee76a9 qmldump: Bump to QtQuick.tooling 1.1, make parser more permissive. 
The qmltypes file reader now ignores unknown bindings and components
to allow for better forward-compatibility.

Change-Id: I2e31c17344dc8fdcd301a62c8d08e98c29ef53ee
Reviewed-on: http://codereview.qt.nokia.com/202
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-05-30 11:26:54 +02:00
Christian Kamm
6e32742400 qmldump: Add dumping of 'revision' for Qt >= 4.7.4. 
Change-Id: Ib86c771be9540e22b48685eacd29d81056b53588
Reviewed-on: http://codereview.qt.nokia.com/199
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-30 09:28:42 +02:00
Christian Kamm
a448f2b61a QmlDump: Update for changes in qtquick2. 2011-04-28 12:19:16 +02:00
Thomas Hartmann
0c8b4e38fa QmlDump: fix path import dumps on Windows 
Absolute file pathes containing drive identifiers do not work in qml.
(C:\)

workaround: use "." imports and setting the component url.

Reviewed-by: Christian Kamm
 2011-04-28 10:41:26 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Christian Kamm
b980a9b964 QmlJS: Fix implicit "." import when . has a QML module. 
Reviewed-by: Erik Verbruggen
 2011-03-10 15:03:36 +01:00
Christian Kamm
d80521aac1 qmldump: Add warning about code being shared with Qt. 2011-03-02 10:51:46 +01:00
Kai Koehne
5dc9a0cb43 QmlDump: Add copyright header 2011-02-18 11:50:27 +01:00
Christian Kamm
13f9135827 qmldump: Dump attached types and read them in Creator. 2011-02-10 17:04:22 +01:00
Christian Kamm
fd7a115d1c qmldump: Ignore exports that are missing the type name. 2011-02-09 13:40:09 +01:00
Christian Kamm
2ec429e8ce QmlJS: Switch to new format for QML meta data. 2011-02-09 10:42:49 +01:00
Christian Kamm
bffe90b2f4 qmldump: Clean up code and make it output qml data. 
Task-number: QTCREATORBUG-3048
 2011-02-09 10:42:48 +01:00
Friedemann Kleint
e39386352a Header cleanup in share/qtcreator/qml, specify module name. 2011-01-24 12:30:21 +01:00
Christian Kamm
315fc34f3b qmldump: Produce an error message if module import fails. 
Reviewed-by: Kai Koehne
 2011-01-21 10:28:19 +01:00
Christian Kamm
033a0ff12e qmldump: Add example to clear up intended usage. 
Reviewed-by: Kai Koehne
 2011-01-12 14:03:01 +01:00
Christian Kamm
18f9031ba6 qmldump: Add signal handler to catch segvs. 
Reviewed-by: aep
 2011-01-12 13:16:07 +01:00
con
7c0b1b63d5 Merge remote branch 'origin/2.1' into master 2010-11-30 16:45:15 +01:00
Christian Kamm
3fbc0bd31d QmlDump: Fix use with namespaced types. 
Reviewed-by: Roberto Raggi
 2010-11-30 13:42:00 +01:00
Christian Kamm
e732b3c102 QmlDump: Allow building and using with Simulator Qt >= 4.7.1. 
Reviewed-by: owolff
Reviewed-by: Kai Koehne
 2010-11-26 11:18:26 +01:00
Thomas Hartmann
f7e7de44cb QmlJS: Dump isWritable and isPointer for types. 
Reviewed-by: Christian Kamm
 2010-11-11 11:49:11 +01:00
Christian Kamm
6f1c1af833 QmlJS: Prepare qmldump for multiply exported C++ objects. 
In the future, builtin objects are going to be exported in Qt 4.7 and
QtQuick 1.0.

Reviewed-by: Roberto Raggi
 2010-10-01 10:14:29 +02:00
Lasse Holmstedt
5d9858129a Compile qmldump with debugging helpers 
Must be compiled during runtime - otherwise, the app may not work
with Qt that is compiled with another compiler.

Reviewed-by: hjk
 2010-09-29 09:39:18 +02:00