| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
backport of ndk/commits/113d4c56180b8f59cb03d738f76dab46dd7fafe0
(cherry picked from commit 0aa12867498c83e415f8759d83af4165c22debea)
|
|
|
|
|
|
| |
mousePos - QPoint(2,2) still returns the current widget, while
-QPoint(3,3) works.
(cherry picked from commit e5076cc5e50be46b2f2a2307660e5e8603b780ad)
|
|
|
|
|
|
| |
Filter out all examples that are missing a .pro file. Afterwards
remove empty categories.
(cherry picked from commit 56f735425af32e4ffdfc959bc90a2ae85f6b4544)
|
|
|
|
| |
(cherry picked from commit d6be0395f202c5981c02f19f820424c7c925059c)
|
|
|
|
|
| |
Task-number: QTCREATORBUG-2130
(cherry picked from commit 9e352be3b1698ee3607ca9c6760a82340d8b50b8)
|
|
|
|
|
| |
Fix typo in commit c2a618ae2f.
(cherry picked from commit b7af9e06f85e0fa27ed422e00e1a9b03a2348ced)
|
|
|
|
|
|
|
| |
Remove unimplemented NOTIFY signals. Furthermore the signals must
be declared in the same class as the Q_PROPERTY (not in a base class):
Fix this in filefilteritems.h.
(cherry picked from commit 8eecf8fcd85b97406c3a7ee29d45540855e40830)
|
|
|
|
|
| |
Fixes compilation with Qt 4.7.1
(cherry picked from commit 20f57fdd8a0aed152c91cc3df500a511ffcf58fe)
|
|
|
|
| |
(cherry picked from commit 7dfcbe5f3998916c005671d23c1fb54aaedb0bbc)
|
|
|
|
|
| |
Task-number: QTCREATORBUG-2136
(cherry picked from commit 02c331e0c4e8edcbe2c9402efe91c202ac521a04)
|
| |
|
|
|
|
|
|
|
|
|
| |
Due to the wrong enumerators being used, it was impossible to define
custom shortcuts for these actions.
Reviewed-by: mae
Task-number: QTCREATORBUG-2139
(cherry picked from commit 07845306dbabf59d3dcc9b85f30f4e998d8806e4)
|
|
|
|
|
|
|
|
| |
(cherry picked from commit a9b8e2e8c90b1a64752843522a32722faef71521)
Conflicts:
dist/changes-2.0.1
|
| |
|
|
|
|
| |
(cherry picked from commit cf8af3272b3d43fdce08458d13b9e78d35946ad4)
|
|
|
|
|
|
| |
Generated with Qt from commit 00bc7129d166f8f3e1486b8bf920d77f46400a6e
(qt-releases repo)
(cherry picked from commit 3bd83a9f8a00b3f4c4779d2ef6e1df2c6e807ac4)
|
|
|
|
| |
* Add test for build- and sourcedirectories being at different levels
|
|
|
|
| |
(cherry picked from commit cff7191064b9e496121ea23f76873d56bddca3d0)
|
|
|
|
|
| |
Task-number: QTCREATORBUG-2114
Reviewed-by: kh1
|
|
|
|
| |
(cherry picked from commit 925d9edaa162f562464c9b433d0bc66a1f525991)
|
|
|
|
|
|
|
|
|
|
|
| |
Enable Qml project related wizards again, but move them to the
"Other Projects" category. We originally disabled them completely
because we want to make Qml Support fully available only with 2.1.
However, for current users it's just weird that they can _open_ a
qmlproject file, but not generate it.
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
|
|
|
|
|
|
|
|
|
| |
Don't misuse the input field for a custom qmlviewer path with displaying
the effective qmlviewer used. Previously the effective qmlviewer was
only calculated when the project pane is shown first, and then never
updated.
Reviewed-by: holmstedt
|
|
|
|
|
|
| |
QmlInspector has been disabled
Reviewed-by: holmstedt
|
|
|
|
| |
Remove unneeded widget (has been added unintendedly in 60fffd
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
$PATH)
If no 'qmlviewer' executable is found in the PATH, iterate through the
list of configured Qt versions and try to find a qmlviewer there. This
should help users configuring creator such to play with Qml.
Right now the first qmlviewer found in a Qt version is selected. A UI
to let the user select one explicitly was not possible any more (string
freeze).
This requires a dependency from QmlProjectManager to
Qt4ProjectManager.
Reviewed-by: dt
|
|
|
|
|
| |
This only works when a qmlviewer is in the PATH, which is non obvious.
Removing the feature therefore completely.
|
| |
|
|
|
|
|
| |
Reviewed-by: Leena Miettinen
(cherry picked from commit 0b99631b0afd80ab3be68f1d22922b5b1d24c6e1)
|
|
|
|
|
|
|
|
|
|
|
| |
Do not clear variable containing submit repository. Fix potential
crash (closing diff editor before command termination),
use proper temp file name. Pass --non-interactive to "commit"
to suppress editors being launched (despite -l).
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Task-number: QTCREATORBUG-1503
(cherry picked from commit abaf2e9f210c778e79a77d50e37e9b11196b70fd)
|
|
|
|
|
|
|
| |
Rephrased thanks to Leena.
Reviewed-by: Leena Miettinen
(cherry picked from commit 4bf97f1f9870dfe0ed7813a8383b1f10181e63cd)
|
|
|
|
| |
(cherry picked from commit a3804bbfe3dbc15ba895b2a289163a7613019d8f)
|
|
|
|
|
| |
Reviewed-by: Alessandro Portale
(cherry picked from commit 0cba8a2e115de26adb62cabab0fb5a236fffffc4)
|
| |
|
|
|
|
| |
(cherry picked from commit 9026def05d9f684ef0deede938e9638964bd6050)
|
|
|
|
| |
(cherry picked from commit f6e94f0a3a1c47cd8b809865d72e4acd2420d116)
|
|
|
|
|
|
|
|
|
|
|
| |
Qt change f5c5e20ab20f016c0735 optimizes the calculation of the
children's bounding rect by taking the parent bounding rect into
account. This led to a recursion in the QuickDesigner Form Editor,
because LayerItem::boundingRect() is defined as the children's bounding
rect.
Break the cycle by setting ItemClipsChildrenToShape to false.
(cherry picked from commit 2067cfcf28bdd5dcbbc64411255925cf52aa1b8a)
|
|
|
|
|
|
|
| |
These are needed because e2347b3d92 is (and should be) in 2.0 but not in 2.0.1 branch.
Reviewed-by: Oswald Buddenhagen
(cherry picked from commit b1bfb147fe1f979815f0fc6d96eb20f44527fc3b)
|
|
|
|
|
| |
Task-number: QTCREATORBUG-1934
Reviewed-by: Friedemann Kleint
|
|
|
|
|
| |
Task-number: QTCREATORBUG-1932
Reviewed-by: Friedemann Kleint
|
|
|
|
| |
(cherry picked from commit 5427f7bf8b24b96bedb2919491716a9289f0bfe5)
|
|
|
|
|
|
| |
Initial-patch-by: hjk
Task-number: QTCREATORBUG-2084
(cherry picked from commit 4b1540e5a730e2e4f0e9c9c8203045fd1f59dca5)
|
|
|
|
|
|
|
| |
The old slider handle did not appear properly
Reviewed-by: Lasse Holmstedt
(cherry picked from commit c214e473f8604992cc4dbe982ae4a410b39beb26)
|
|
|
|
|
|
|
|
|
| |
QTemporaryFile destructor causes a file changed signal due to it
holding on to it.
Reviewed-by: dt
Task-number: QTCREATORBUG-2083
(cherry picked from commit 3e31a770b5aa882c4fccdea65c7f8504beab032a)
|
| |
|
|
|
|
| |
(cherry picked from commit 69fb75b627d478796f95518a66353a543d588fe3)
|
|
|
|
| |
(cherry picked from commit 991aceb0fda59e7803dc9bfd3ae602a26f03d874)
|
|
|
|
|
|
| |
an image to exclude Qt Quick examples.
Reviewed-by: Kai Köhne
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is the squashed result of a team effort. Authors are:
Jonathan Courtois <jonathan.courtois@gmail.com>
Belz Guillaume <guillaume.belz@free.fr>
Cédric Bonnier <myzu69@gmail.com>
Francis Genet <francis.genet@supinfo.com>
Pierre Rossi <pierre.rossi@nokia.com>
For full history, checkout the team's repo:
http://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr
See also: http://qt.developpez.com/
Merge-request: 168
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
(cherry picked from commit ffdd4110ae4d366e80e1e3ea207624d8ecc9fde3)
|