Thomas Hartmann
|
1f940786fb
|
Merge branch 'qml_renaming'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
|
2010-03-01 09:44:00 +01:00 |
|
Kai Koehne
|
37df9fcb78
|
QmlProjectManager: Remove debugging output
|
2010-02-28 10:58:10 +01:00 |
|
Kai Koehne
|
4c59f3f2ce
|
QmlProjectManager: Fix compilation with latest changes of QDeclarative
All files have been renamed from Qml to QDeclarative.
Registration of types is now done in an initializer method.
|
2010-02-26 14:46:04 +01:00 |
|
Tobias Hunger
|
4cd5cb0eab
|
Save debug server settings in QML RunConfiguration
Reviewed-by: Kai Koehne
|
2010-02-22 12:24:28 +01:00 |
|
Lasse Holmstedt
|
8605750b5f
|
Added a missing slot implementation for server address change
|
2010-02-16 17:15:38 +01:00 |
|
Lasse Holmstedt
|
4e5089d90d
|
Merge branch 'debugintegration'
Conflicts:
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlproject.h
|
2010-02-16 16:30:41 +01:00 |
|
Kai Koehne
|
fdd85b7f33
|
QmlProjectManager refactoring
Putting every class in it's own files + avoid "using namespace"
|
2010-02-16 13:43:27 +01:00 |
|