| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Task-Nr: QTCREATORBUG-1732
|
|
|
|
|
|
| |
Manually fix breakage introduced by merge conflicts.
Task-number: QTCREATORBUG-1503
|
|
|
|
| |
(cherry picked from commit d9a690fe5f645efbd60fadca7945af86a6234b57)
|
|
|
|
|
| |
Reviewed-by: kh
(cherry picked from commit a47ec389cc26ff8f5592f94e3ec34f5465b443b5)
|
|
|
|
| |
(cherry picked from commit b1514ed6ecefb2393c48138d8957bf2877041ece)
|
|
|
|
|
|
|
|
|
| |
When switching from text editor in Edit mode to a visual editor in
Design mode via Opt+Tab.
Task-number: QTCREATORBUG-1665
Reviewed-by: Daniel Molkentin
(cherry picked from commit 11549acdbe0916bd20a1a22a6fb51e869b232bc0)
|
|
|
|
|
| |
Reviewed-by: kh1
(cherry picked from commit cfdb5d7446e64086609c5943c7806762ed1bfbc4)
|
|
|
|
|
|
| |
Maemo devices.
(cherry picked from commit c10d99720971f3469a1a1a87983a9f369404895a)
|
|
|
|
|
|
|
| |
The spacing errors come from Qt, and should be fixed there.
Reviewed-By: Oswald Buddenhagen
(cherry picked from commit c7db4a09c8c3cb5de203a3f2d9e43d690b67e73a)
|
|
|
|
|
|
| |
as it breaks the log output.
Task-number: QTCREATORBUG-1623
(cherry picked from commit b8c78764e2d905da4adab7b1c6ad18aa1b77dbe3)
|
| |
|
|
|
|
|
|
|
| |
for Symbian Emulator.
Reviewed-by: Tobias Hunger
(cherry picked from commit e6e069a6f9819174c28d7115af27fa11e0531d58)
|
|
|
|
|
| |
Merge-request: 2166
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
* Make this more reliable and faster using less code.
Reviewed-by: dt
(cherry picked from commit 7f58e0e8a37953479622965cf2f2a9cbf78f6e7f)
|
|
|
|
|
|
|
| |
Fixes breakage introduced by 34982c1f2361be0428a00007e7b0dea310a0b315.
Task-number: QTCREATORBUG-1612
Reviewed-by: dt
(cherry picked from commit e80a4b962f096b006ca01761fad485f475813fd1)
|
|
|
|
|
|
|
| |
Creator manual.
Reviewed-by: con
(cherry picked from commit e5f0ea6d036f8eba65c571349ac14158e6da6288)
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: con
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
(cherry picked from commit 16223cb83cd75b72489d4829bd48a6c0e7f8e7ce)
Conflicts:
doc/qtcreator.qdoc
|
|
|
|
| |
(cherry picked from commit 47165a9119ee789fda4889df06b6732044de1a3e)
|
|
|
|
|
| |
Reviewed-by: Christian Kamm
(cherry picked from commit 2461c3dc65559333683a786ef3749d6a5d0a872e)
|
|
|
|
| |
(cherry picked from commit dc6303c05067f9472e6bcb537de0572a59f22365)
|
|
|
|
| |
(cherry picked from commit 060888208054fb5593bca89b6fc83f44bd12a97d)
|
|
|
|
| |
(cherry picked from commit 383d9ab9e706b1ea152029320ba99e6b83aa9f76)
|
|
|
|
|
|
| |
Reviewed-by: Niels Weber
Reviewed-by: Tim Jenssen
(cherry picked from commit 8e0d6a0d94f2485a8d2f01ec2e88a2ec20bc0255)
|
|
|
|
|
| |
Task-number: QTCREATORBUG-1609
(cherry picked from commit 740717f060c0668377ec9c18b68e73daffe41c4c)
|
|
|
|
|
|
|
|
|
|
| |
* Fix displayed shadow build location
* Fix shadow build location used by newly set up shadow builds
Task-number: QTCREATORBUG-1599
Reviewed-by: dt
(cherry picked from commit 1d8e176067c48705cdfd746e2c1fb23539f58a8e)
(cherry picked from commit b099596858af3617294caea71f7c8959a6b3ccbe)
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-1567
Reviewed-by: Friedemann Kleint
(cherry picked from commit b6ee94fb5ff652ba22b272a064c2be541b4bcf56)
|
|
|
|
| |
(cherry picked from commit be99363b16d5976e710dbe68abf144af64e49db8)
|
| |
|
|
|
|
|
|
|
|
|
| |
While 2641496a997 removed the marks check entirely, a fix for the same
issue made on the master branch (1263babfc6c96) changed it to check
whether the line numbers are visible. This is more correct.
Reviewed-by: mae
(cherry picked from commit 502e86b7373c24411e79cb684eb454530f45f5b5)
|
|
|
|
|
|
| |
Merge-request: 143
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit effe3e6e23ccabb1e9d6049774d6dded868b95d5)
|
|
|
|
|
| |
Task-Nr: QTCREATORBUG-1411
(cherry picked from commit 69bd2df4e4f310fc6c6a6911f1d10c4fcf2c75c9)
|
|
|
|
|
|
|
| |
Do the project restore for each project directly after opening and only
then processEvents(). A project might be in a intermediate state between
opening and restoring.
(cherry picked from commit 4ad02938c89f8df09bdae3e566cd62cb3bf17f08)
|
|
|
|
|
| |
Reviewed-By: kh1
(cherry picked from commit e0b2cbe3bf26a86c5474d667ce5e9018168e17e4)
|
|
|
|
|
| |
Reviewed-By: Leena Miettinen
(cherry picked from commit 3f715252b698205e7acd8f58a7688eabb46fb2c3)
|
|
|
|
|
|
| |
Reviewed-By: Leena Miettinen
Reviewed-By: kh1
(cherry picked from commit 723754d215793c10bda546cc180fcf9d96f457f2)
|
|
|
|
|
|
|
|
| |
Only insert necessary newlines
Reviewed-by: thorbjorn
Task-number: QTCREATORBUG-1476
(cherry picked from commit 7c82944750f22dd8048177287cf3cb36e5e015d4)
|
|
|
|
|
| |
Reviewed-by: holmstedt
(cherry picked from commit 736293599b50807aa8d306eee3cd9616de81d597)
|
|
|
|
|
|
| |
(cherry picked from commit 84bba817c979189d099e4c0a462699186df3c38c)
Reviewed-by: Leena Miettinen
|
|
|
|
|
| |
Reviewed-by: Leena Miettinen
(cherry picked from commit a7f1e80322254aec7f4b9b8a455424a9bb80dc53)
|
|
|
|
|
| |
Reviewed-by: Leena Miettinen
(cherry picked from commit d5f308032bb3971c710b9d8ff121dfed2b84be34)
|
|
|
|
|
| |
Reviewed-by: jbache
(cherry picked from commit 6527fd1dfa53abf5d4daf8a4f21104516c5bce08)
|
|
|
|
|
|
|
|
| |
I now cache the scaled welcomemode background so it feels more
responsive when toggeling back and forth between modes.
Reviewed-by: joao
(cherry picked from commit ce5f0a39ae88cf215fa0654594085e0a91d698b8)
|
|
|
|
| |
(cherry picked from commit 53bdae3f93c5f25abc8b24661f838604929eae7d)
|
|
|
|
| |
(cherry picked from commit bf6939314a4fa6460e4e4ec015a9ed77c8e5b8c3)
|
|
|
|
|
| |
Reviewed-by: dt
(cherry picked from commit 86d6fca7766b1f917792d34bd77f84aee36b50fc)
|
|
|
|
|
|
|
| |
for TRK installation.
Reviewed-by: Tim Jenssen
(cherry picked from commit 08ded66396d9d7e3d146e40c9bc00a970ee4d8f5)
|
|
|
|
|
|
| |
Reviewed-by: olli
Reviewed-by: Niels Weber
(cherry picked from commit ca1aab8be32c3c26cc5580a923f1719c1189ee56)
|
|
|
|
| |
(cherry picked from commit ca3f443a756cd29943f3c8f0d7026788ec4bef02)
|
|
|
|
| |
(cherry picked from commit 890ebd671756bf42e1f2a2f2843b7c58af40b3a4)
|
|
|
|
| |
(cherry picked from commit 111884365ac6883cffe3088cb378799541f68ec0)
|