Eike Ziller
0aecf9c195
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
2014-09-29 10:31:12 +02:00
Thiago Macieira
34d897165d
Fix the build: add missing #includes
...
<QWidget> for QWidget, <QDataStream> for QDataStream and <QMetaObject>
for Q_GADGET (technically, qobjectdefs.h)
Change-Id: Ia7e8b12ff4c67827bb7782a0337714e330de1db1
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com >
Reviewed-by: hjk <hjk121@nokiamail.com >
2014-08-18 15:11:56 +02:00
Orgad Shaneh
8a42154f24
QmlPuppet: Remove duplicate condition
...
Change-Id: I2a521aa08347d83b236d490e698081e552381ed7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2014-05-20 11:44:02 +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
Marco Bubke
0ba2b9b37d
QmlDesigner: Add qdebugs for commands
...
Change-Id: I60bdd5b36749be5092d4dabe486b101d62b3df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-07-16 17:04:31 +02: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
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
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
Marco Bubke
8fe3302329
QmlDesigner.NodeInstances: Move qmlpuppet to share
...
Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7
Reviewed-on: http://codereview.qt.nokia.com/634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com >
2011-06-22 18:24:36 +02:00
