Commit Graph

12 Commits

Author SHA1 Message Date
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Christian Kandeler
53e2cbfb7f RemoteLinux: Move some stuff into the new target base class.
All these things were always conceptually per-target, but due to not
having a common target class we had to awkwardly implement the concept
using shared pointers.

Change-Id: I1bb1992a230a485d519a892a6ca602a6846fc3cf
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-02-08 14:47:26 +01: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
Nikolai Kosjar
f75abb341e Deploy steps: Introduce SimpleBuildStepConfigWidget.
This simplifies some deploy steps and replaces
RemoteLinuxDeployStepWidget.

Change-Id: I4ad82c498cee0f15e1c93bf915cd48355017eb84
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>
2012-01-11 16:02:19 +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
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
Christian Kandeler
d48087d13d RemoteLinux: Allow skipping default targets in tar packages.
Change-Id: I229aa0ec3bfa1a135c9f14e272900995ac834421
Task-number: QTCREATORBUG-6324
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-24 18:02:28 +02:00
Daniel Teske
3cc1a2a914 Less magic in BuildStep::buildConfiguration() and deployConfiguration()
Where the deploy stuff depends on the activeBuildConfiguration it's
likely to be wrong or worse could be used to crash creator. So make
those places stand out.
Also if we ever move towards supporting meta-builds of multiple
buildconfigurations at once, then using the active build configuration
is wrong.

Change-Id: I754a77a4a8b352e79e8a6703c26ed41a189cf74e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-10-24 12:08:04 +02:00
Daniel Teske
487b56b0b7 Make AbstractPackagingStep and derived classes thread safe
Change-Id: I30d412dde2484b756dd2f06ed0a7b5030c14c9eb
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-20 16:22:45 +02:00
Christian Kandeler
04edb4513c RemoteLinux: Overhaul deployment infrastructure.
- Introduce generic and Madde-specific deploy configuration widgets.
- Move project file update logic into dedicated class.
- Generic deploy configuration widget no longer has the ability to change deployment settings via the GUI, because we cannot know which qmake scope to use for that.

Change-Id: Ie542a0852c8aa1c6b416cd7aece4e48c1cc2de7c
Reviewed-on: http://codereview.qt.nokia.com/2445
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-08-01 17:31:26 +02:00
Christian Kandeler
076064ce30 RemoteLinux: Introduce abstract packaging step.
This removes the dependency of the tar packaging step on Maemo-specific code.

Change-Id: I863b13e643a5028edaf2f571f63b1a52d229812b
Reviewed-on: http://codereview.qt.nokia.com/1709
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-15 17:06:29 +02:00