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
Thomas Hartmann
229105ba89
QmlDesigner: adding manual test files for Qt Quick 2.0
...
Change-Id: I44d3a4165d1ff12488bcc63f19765bc7cf91bc18
Reviewed-by: Robert Loehning <robert.loehning@digia.com >
2013-01-15 13:51:34 +01:00
Thomas Hartmann
9fd73a2175
QmlDesigner: Fixing broken test case
...
Since the rect is moved to 648, 480 nothing is visible.
It should be witdth and height instead.
Task-number: QTCREATORBUG-8543
Change-Id: I27721d6df83f5120315bc1f5aff4cc04732e4f60
Reviewed-by: Robert Loehning <robert.loehning@digia.com >
2013-01-11 15:33:07 +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
2931a499e6
Long live the king!
...
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-01-26 19:55:36 +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
Thomas Murach
a4c4d67772
corrected license headers
...
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
Reviewed-on: http://codereview.qt.nokia.com/1251
2011-07-06 17:56:15 +02:00
Thomas Hartmann
3d417ed605
QmlDesigner.tests: adding a new testfile
...
Change-Id: I1de64b5ddb2262a08e7a50f368a7412b11c1f60d
Reviewed-on: http://codereview.qt.nokia.com/94
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com >
2011-05-24 17:23:18 +02:00
Alexis Menard
64839753f2
QML WebKit component is now named QtWebKit
...
Reviewed-by:Christiaan Janssen
2010-06-23 11:37:41 +02:00
Kai Koehne
05badc8c30
QmlDesigner: Fix flipable.qml example file
2010-04-15 17:08:34 +02:00
Kai Koehne
e7a9619c2f
QmlDesigner: Bump version number from 4.6 to 4.7 in qml files
...
Reviewed-by: Thomas Hartmann
2010-04-13 15:15:15 +02:00
Kai Koehne
9fcd258c68
QmlDesigner: Add test case of WebView usage
2010-04-12 12:26:59 +02:00
Thomas Hartmann
afdd673771
QmlDesigner: change manual test
2010-03-31 18:49:09 +02:00
Kai Koehne
5ed718a002
Fix imported qml component names under Windows
...
Reviewed-by: ckamm
2010-03-31 15:50:02 +02:00
Thomas Hartmann
fbb7a343b3
QmlDesigner: add new file for manual tests
2010-03-31 11:05:26 +02:00
Kai Koehne
38b5ef374e
QmlDesigner: Replace *.ico with *.jpg
2010-03-26 14:29:47 +01:00
Kai Koehne
7daeffbd29
QmlDesigner: Add new test files for manual testing
2010-03-26 12:04:18 +01:00
Kai Koehne
7d423d5f96
QmlDesigner: Fix crash in property editor when parent of an item is invalid
...
Happened for
import Qt 4.6
Flipable {
Rectangle {}
}
2010-03-18 16:56:47 +01:00
Kai Koehne
bce9521780
QmlDesigner: Add files for testing image formats
2010-03-15 09:36:10 +01:00
Kai Koehne
31f7c87537
QmlDesigner: Fix StatesView for switching subcomponents
...
Reviewed-by: Thomas Hartmann
2010-03-09 12:23:21 +01:00
Kai Koehne
a673fb7120
QmlDesigner: Fix crash when root item of .qml file not QDeclarativeItem based
...
Task-number: BAUHAUS-424
Reviewed-by: Lasse Holmstedt
2010-03-03 12:03:34 +01:00
Kai Koehne
7856b196db
QmlDesigner: Fix states.qml example file
2010-02-25 09:48:19 +01:00
Kai Koehne
fc57893921
QmlDesigner: Add a couple of example .qml files for manual testing
2010-02-24 16:50:21 +01:00
