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
Nikolai Kosjar
9c7b9fd9f2
Deploy steps: Hide details button if applicable
...
Task-number: QTCREATORBUG-6674
Change-Id: I3cca8a75b1108f4fede09191cfed76c8fcf44c0e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
Reviewed-by: Paweł Polański <pawel.3.polanski@nokia.com >
2011-12-12 11:05:28 +01:00
Daniel Teske
f5d4287123
Use Utils::FileName for various bits in QtVersion
...
Change-Id: I3afc3a4f2e0dd2671279c2d071779f1d7b277849
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-12-07 15:05:31 +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
Eike Ziller
81cce8902e
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljscheck.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
2011-10-28 10:17:44 +02:00
Christian Kandeler
5a38e9b9cc
Fremantle: Don't use unsupported "mad" option.
...
Our SDK uses an outdated MADDE that does not support
the "--no-force-downgrade" option when deploying into the sysroot.
Task-number: QTCREATORBUG-6328
Change-Id: Icb0c9774daee9b9840403ca8a14c9f6604cf3624
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
2011-10-24 17:47:57 +02:00
Daniel Teske
4fe26cb509
Remove processEvents
...
Change-Id: I8daa2a9675d72886aa598d4f17ee48e55665f92a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
2011-10-14 15:19:39 +02:00
Daniel Teske
171f8b50fd
Make MaemoInstallPackagToSysroot* thread-safe
...
Change-Id: If4ded3f5596c16409012edf267d96a72c3b7f4ad
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
2011-10-14 14:43:31 +02:00
Daniel Teske
597c40b49e
Make MaemoInstallToSysRootStep thread safe
...
Change-Id: Id83e93c94af1499476868603ba654a278da6ff38
Reviewed-on: http://codereview.qt-project.org/5453
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
2011-09-26 12:09:05 +02:00
Christian Kandeler
4e7d0d9c9a
Introduce new "Madde" plugin.
...
The new plugin contains everything specific to Maemo and MeeGo
as supported by the MADDE framework.
This leaves the RemoteLinux plugin with abstract base classes and
generic implementations.
Change-Id: I6068caa758214cf26a27fe9893e0817b7834b580
Reviewed-on: http://codereview.qt-project.org/5230
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-09-22 14:11:06 +02:00
