Oswald Buddenhagen
dc3c156cac
Merge branch '2.2'
...
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
Jarek Kobus
4d69c7455e
Remove unused constants, fix lacking virtual destructor
...
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-04-14 12:08:47 +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
b1bcf081d8
Merge branch '2.1'
...
Conflicts:
src/plugins/coreplugin/basemode.cpp
src/plugins/coreplugin/basemode.h
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
src/plugins/debugger/debuggeragents.cpp
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/debugger/debuggeruiswitcher.h
src/plugins/projectexplorer/buildconfigdialog.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
src/plugins/qmldesigner/designercore/include/modelutilities.h
src/plugins/qmldesigner/designercore/include/nodeinstance.h
src/plugins/qmldesigner/designercore/include/propertymetainfo.h
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
src/plugins/qmldesigner/designercore/model/modelutilities.cpp
src/plugins/snippets/inputwidget.cpp
src/plugins/snippets/snippetscompletion.cpp
src/plugins/snippets/snippetscompletion.h
src/plugins/snippets/snippetspec.cpp
src/plugins/snippets/snippetsplugin.cpp
src/plugins/snippets/snippetswindow.cpp
src/plugins/snippets/snippetswindow.h
src/plugins/texteditor/snippetsparser.cpp
src/tools/qml/qmldom/main.cpp
tests/manual/trk/runner.cpp
tests/manual/trk/trkolddevice.cpp
tests/manual/trk/trkolddevice.h
tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049
License headers.
2010-12-17 16:03:42 +01:00
Kai Koehne
dcd1876d5b
QmlProject: Restrict UI to using the System Environment
...
There are probably very little use cases where you want to start
from a clean environment, and there is no such thing as a Build
Environment (although we magically add some toolchain settings to
the environment).
2010-11-29 14:18:11 +01:00
Kai Koehne
e398225cd0
QmlProject: Allow user to change process environment
...
Task-number: QTCREATORBUG-2600
2010-11-29 14:18:11 +01:00
Kai Koehne
0c054bed77
QmlProject: Let user select Qt version to use
...
Allow the user to choose which Qt version to use for running
a .qmlproject.
Reviewed-by: dt
2010-10-04 16:59:58 +02:00
Kai Koehne
6f11765dae
Qml: Allow user to configure port used (all project types)
...
Reviewed-by: dt
2010-09-03 12:29:41 +02:00
hjk
035cfd5506
code cosmetics
2010-06-10 14:43:49 +02:00
Kai Koehne
adad842bbe
Rename QML Runtime to QML Viewer again in the UI
...
Latest qt renamed qml executable back to qmlviewer, and also named
the executable again QML Viewer instead of Runtime/Launcher.
2010-05-20 12:00:35 +02:00
Kai Koehne
1a37b0e762
Rename QML Viewer to QML Runtime
2010-03-10 16:39:15 +01:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +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
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
