feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,769 Commits 108 Branches 368 Tags
a44aa55502b1d9f548692e49ab7cea13d341c8ca
Commit Graph

31 Commits

Author SHA1 Message Date
Orgad Shaneh
a44aa55502 Add whitespace after control keywords 
find -name \*.cpp -o -name \*.h | \
  xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'

Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-28 20:20:46 +01: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
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
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +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
a7f78991c9 QmlJS: Move commonly used functions to qmlutils.h. 
Change-Id: I22376d96fe575bc00a55094c06af80e32a5587e6
Reviewed-on: http://codereview.qt-project.org/6238
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-10 09:36:12 +02:00
hjk
5295e05310 minor style 
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:24:14 +02:00
Christian Kamm
4b2f42cf87 QmlJS: Adjust existing code for updated QML parser. 
Change-Id: I153723eeb9973be025daf47e317f7b9d076a3c72
Reviewed-on: http://codereview.qt-project.org/4733
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-14 11:48:22 +02:00
Christiaan Janssen
90a812a8a8 QmlLivePreview: fix crash when inserting node with no parents 
Change-Id: Ib781f64aed11aafc106dc15b40689181fefd5dd3
Reviewed-on: http://codereview.qt.nokia.com/3171
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-08-18 11:52:30 +02:00
Christiaan Janssen
5a1f5c6fc8 QmlLivePreview: correctly formating file URL 
Change-Id: I7c77d7854dac8e28cd5bcdeb4e6a8687fdb8606e
Reviewed-on: http://codereview.qt.nokia.com/361
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-08 13:45:38 +02:00
Christiaan Janssen
3cf5379380 QmlLivePreview: removing and inserting animations and transitions 
Change-Id: Ic776f63f5d7925ac7dfd99be53c10b9af4cb9545
Reviewed-on: http://codereview.qt.nokia.com/75
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-05-24 13:03:43 +02:00
Christiaan Janssen
2d41159dab QmlLivePreview: avoid compiler warnings on gcc on mac 
Reviewed-by: Roberto Raggi
 2011-05-18 12:30:37 +02:00
Christiaan Janssen
09a78a3ae7 QmlLivePreview: adding states to an item 
Reviewed-by: Kai Koehne
 2011-05-17 10:42:45 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Christiaan Janssen
89d9b83aa2 QmlDebugger: adding slots to items in Live Preview 
Reviewed-by: Kai Koehne
 2011-05-05 17:03:37 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Kai Koehne
d1175f3ea2 QmlJSObserver: Fix crash when adding an element to some .qml files 
Make sure that the 'artifical' URL of the item created actually is
absolute (starts with a file:///). Otherwise an Assert will be hit
when the imports include e.g. a .js file, and the Engine tries to
load it.

Task-number: QTCREATORBUG-2644
Reviewed-by: Olivier Goffart
 2010-10-08 15:51:56 +02:00
Kai Koehne
6863a848e9 QmlJsDelta: Guard qDebug output 2010-10-08 15:51:55 +02:00
Christiaan Janssen
0bc0a2df5a QmlObserver: showing a warning when changes cannot be synchronized 
Reviewed by:  Thomas Hartmann
 2010-09-22 16:30:21 +02:00
Olivier Goffart
af01698cfc qmljsdelta: Fix updating property on UiObjectBinding 2010-08-27 17:15:21 +02:00
Christiaan Janssen
7d9056953e QmlInspector: Added reparenting of items in the Qml Live Preview. Reviewed by: Lasse Holmstedt 2010-08-26 17:38:42 +02:00
Olivier Goffart
4dadefc858 Compile on windows 
Apparently, it did not like ::label
 2010-08-19 12:51:04 +02:00
Olivier Goffart
6b2d8118c5 qmljsdelta: little cleanup and documentation of the code 2010-08-19 11:35:39 +02:00
Lasse Holmstedt
714a266cbe QML JS Inspector: Improve warning messages 
When a change is done to an element that cannot be changed due to
debugger/qdeclarative limitations, a warning is shown to the user in QML
JS Editor.

Reviewed-by: Olivier Goffart
 2010-08-05 16:31:13 +02:00
Olivier Goffart
713e4c2621 QmlJsDelta: give a valid label to the UiScriptBinding 2010-07-27 11:56:59 +02:00
Olivier Goffart
0ba5dc8d58 QmlJsDelta: Fix the fact that sometimes, when inserting items, the new item could match the next item 2010-07-26 13:09:56 +02:00
Olivier Goffart
f24216bdbb QmlJsDelta: moved to the QMLJS library 
Also used 'int' instead of QDeclarativeDebugObjectReference for
the debug id in order not to use the private API from QMLJS
 2010-07-21 14:27:38 +02:00