| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Task-Nr: QTCREATORBUG-6063
Change-Id: Ieace3e9e68b4e0342c35ac7c279f4b0b61076419
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
|
|
|
|
|
| |
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|/
|
|
|
| |
Change-Id: Id77ff7681c31ccca5778bbe1eed5a341523c03c1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
It is too far to the left now, but that can't be helped
(it's a Qt limitation).
Task-number: QTCREATORBUG-6156
Change-Id: I0201356234abb618dc3b573673d512c0a97c4839
Reviewed-on: http://codereview.qt-project.org/5406
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Disentangle the covariant returns and introduce
convenience accessors.
Move internal classes away from Qt4Project.
Change-Id: I6c3158988824d2a159b1b3f8ecdf8432c32be2bc
Reviewed-on: http://codereview.qt.nokia.com/3216
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
| |
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
|
|
|
|
| |
Task-number: QTCREATORBUG-3822
|
|
|
|
| |
Task-number: QTCREATORBUG-4655
|
| |
|
|
|
|
| |
Reviewed-by: Friedemann Kleint
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rewrite the target setup page to look and baheve better.
Noteable better at:
- Disabling shadow building
- Deselecting whole targets
- Adding import directories
Api-wise, Targets derived from Qt4BaseTarget have two ways to customize
the targetsetuppage.
a) Reimplement availableBuildConfigurations
b) Leave createTargetSetupWidget and create(... Qt4TargetSetupWidget)
in their default implementation. (Or only slightly customize like
the desktop target does.)
Or:
a) Make a dummy implementation for availableBuildConfiguration
b) Replace createTargetSetupWidget and return your own widget
(It should match the look and feel from the other widgets.)
It needs to be derived from Qt4TargetSetupWidget
c) Also replace the create create(... Qt4TargetSetupWidget) function
and set up the target anyway you want.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Almost(*) all of the symbian and maemo specific code is now theoretically
moveable to a separate plugin. Thus making it possible to implement
new targets in a plugin.
(*) Noteable missing is the qtversion, which needs to be split up
per target too.
Also fixes
Task-Nr: QTCREATORBUG-2440
Reviewed-By: hunger
Reviewed-By: ck
|
|
|
|
| |
Reviewed-by: hjk
|
| |
|
|
|
|
| |
Task-number: QTCREATORBUG-2003
|
| |
|
| |
|
| |
|
|
|
|
| |
Task-number: QTCREATORBUG-1597
|
|
|
|
|
|
|
|
| |
* Fix displayed shadow build location
* Fix shadow build location used by newly set up shadow builds
Task-number: QTCREATORBUG-1599
Reviewed-by: dt
|
|
|
|
|
| |
We only have one page there, so there is no need for the
side widget.
|
|
|
|
| |
Tasknumber: QTCREATORBUG-1149
|
|
|
|
| |
Reviewed-by: dt
|
|
|
|
|
|
|
|
|
| |
Show the import wizard on all imports. This eases import of
shadow builds at non-default locations.
Task-number: QTCREATORBUG-1069
Task-number: QTCREATORBUG-1068
Reviewed-by: dt
|
|
|
|
|
|
|
|
| |
Fix possible crash on import of projects into creator with
only one valid Qt version set up.
Reviewed-by: dt
Task-number: QTCREATORBUG-1017
|
| |
|
|
|
|
|
|
|
| |
* Handle shadowbuild directories
* Refactor the code
Reviewed-by: dt
|
| |
|
|
|
|
|
|
| |
... use it.
Reviewed-by: dt
|
| |
|
|
|
|
| |
Do this as part of the ProjectLoadWizard
|
| |
|
|
|
|
|
| |
... when creating a new project without any Qt version being
available
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* Ease cross device development by introducing 'targets' which
group build- and runsettings that are valid for this one target
Most of the kudos for the code review go to dt. Con, thorbjorn,
ckandler and others did also review parts of this patch.
Reviewed-by: dt
|
|
|
|
| |
QString: Use QChar where appropriate.
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Use id() for methods returning a string used to represent
some type of object.
* Use displayName() for strings that are meant to be user
visible.
* Quieten some warnings while touching the files anyway.
* Move Factories to their products in the plugins where that
was not done before.
Reviewed-by: dt
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/projectexplorer/projectexplorer.h
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
| |
That is we actually parse the mkspec and evaluate QMAKE_CXX (and a few
other variables) to figure out the correct mkspec. This makes using
custom mkspecs easier and is also cleaner. I also changed mkspec() and
mkspecPath() to behave a little diffrent, essentialy mkspec() will
return only the name (the actual dir name) of the mkspec. That is in
general not sufficient for passing on to qmake. mkspecPath() only
returns the correct path to mkspecs/default.
Hopefully I haven't broken WinCE/Maemo/MinGW.
|
|
|
|
| |
Reviewed-by: dt
|
| |
|
|
|
|
| |
Builds, but I'm pretty sure it doesn't *work* :)
|