| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
This reverts commit 84d6ea75bc4afe335ece05f1cb31a222294b3718.
This branch is supposed to compile against Qt 4.7-beta1 .
|
| |
|
| |
|
|
|
|
|
|
| |
project that is not in git.
Backport of the non-intrusive parts of 5923733889075800a0979c73476bf3bbae204e89
|
|
|
|
|
| |
response was received
(cherry picked from commit 1af67204b7f2f91d54a4a9bf21d05339959491b6)
|
|
|
|
|
| |
Task-Number: BAUHAUS-606
(cherry picked from commit 212afcfa921c0ef3fac938de221a60277de56d3c)
|
|
|
|
|
|
|
| |
Fixes the broken topic chooser and keyword resolving.
Reviewed-by: ck
(cherry picked from commit e6900ff03d58a2ec2200ee87ee6b3f5a1d72b8e6)
|
|
|
|
|
| |
Reviewed-by: kh
(cherry picked from commit 342e62125312b471a82f03b955c977ef4feb5371)
|
|
|
|
|
|
|
|
| |
the sub-strings "escaped" from the evaluator through the accessor, so
things did go boom, after all.
Reviewed-by: thorbjorn
(cherry picked from commit 2113669fba0956c78f3cbd63ca7c201daefaa8d9)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QtCreator crashed on exit when the library/navigator/sidebar wasn't
visible in the Design mode. This is caused by a double deletion: The
widgets have the DesignModeWidget as the default parent + the side bar
items try to delete them on exit.
Fixed by removing default parent.
Task-number: QTCREATORBUG-1197
Reviewed-by: Christiaan Janssen
(cherry picked from commit db2fcdb4169dbd0b67f21912beb7878c5bd072a3)
|
|
|
|
|
|
|
| |
it once.
Reviewed-by: kkoehne
(cherry picked from commit 854309267d153ed52e6866e8e4a6e91676c8a8ce)
|
|
|
|
|
|
|
|
|
|
| |
This is fixing a crash because the code was asuming that list could be
only readonly properties.
Task-Number: BAUHAUS-589
Task-Number: BAUHAUS-568
Reviewed-by: kkoehne
(cherry picked from commit 6d3d54a84f17556d62ae8448af3d6e91283ca677)
|
|
|
|
|
|
|
| |
I changed this because we get "false" crash reports.
Reviewed-by: kkoehne
(cherry picked from commit 2eb96a8ed3f2b10c1ab5479b5ae514f15f4fe70c)
|
|
|
|
|
|
|
|
|
|
| |
imports (in the model) are broken (regression)
Since I rely on working imports in copy and paste broke.
I hardcode 4.7 in this patch!
Reviewed-by: Kai Koehne
(cherry picked from commit de610cac45f227d7c15015000d6e32d5dc614e09)
|
|
|
|
|
| |
Reviewed-by: Erik Verbruggen
(cherry picked from commit 922092937565dfa02f4055fdf84358f9cceace61)
|
|
|
|
| |
(cherry picked from commit cfe771cc373fc192e305d2f00cc81ef24ac4df10)
|
|
|
|
|
|
|
|
| |
Handle qmake with or without trailing .exe on windows. Looks like the
extension got lost recently in the generated Makefiles.
Reviewed-by: dt
(cherry picked from commit 5a97f79e0bafc56d9403d5dfbdf5eda204efe4ce)
|
|
|
|
|
| |
Reviewed-By: hunger
(cherry picked from commit ee230f2d5430010eeb802f8a9b7748639514f051)
|
|
|
|
|
| |
Reviewed-By: hunger
(cherry picked from commit 5c6007226fc8a8e00899d5832c7f3f2efe55566d)
|
|
|
|
|
|
|
| |
The 2.0.0-beta branch doesn't understand them. This removes a bunch
of warnings at startup.
Reviewed-by: Erik Verbruggen
|
|
|
|
|
|
| |
Task-Number: BAUHAUS-574
Reviewed-by: kkoehne
(cherry picked from commit 629a4d66c17c38a3f458d4aa90a9804aca5a4645)
|
|
|
|
|
| |
Reviewed-by: kkoehne
(cherry picked from commit 05f43cd6ba5448e9ce9e8a02943305ec2c86f80a)
|
|
|
|
|
| |
Reviewed-by: kkoehne
(cherry picked from commit c09b515446bc254ca0ef376f0eeb8f036f7ff866)
|
|
|
|
|
|
| |
Task-Number: BAUHAUS-566
Reviewed-by: kkoehne
(cherry picked from commit 8e6095e3eaa5ee726916a54a27ff601b575537ab)
|
|
|
|
|
|
|
| |
Actually it's 'variant' now, not 'var' any more
Reviewed-by: Thomas Hartmann
(cherry picked from commit 300f90f16105691c07f7e78c9b776285fa2ab9e6)
|
|
|
|
|
|
|
|
|
| |
It seems the runtime got new checks, since loading the Property Editor
failed with
'Invalid property assignment: "font" is a read-only property"'
Reviewed-by: Thomas Hartmann
(cherry picked from commit 559ac20680900ed64c9306f22540f4f4f59cb985)
|
|
|
|
|
|
|
|
| |
(cherry picked from commit 850c7251ab6a94b8ceecb5b2331214c7be20c777)
Conflicts:
share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
|
|
|
|
| |
(cherry picked from commit 37d192099d707589f8dbeda69430c3a72eaef274)
|
|
|
|
|
|
|
|
| |
See Bauhaus-584
There were some locks missing during setup
Reviewed-by: Kai Koehne
(cherry picked from commit f6121924642c872557432c9aea5b996953d6603b)
|
|
|
|
| |
(cherry picked from commit 2aa08edcd09e09448bbd6ced3c5e4bb8d8940de8)
|
|
|
|
|
|
| |
This patch needs to be applied to any gdb newer then Sep 17, 2007
before using it for Maemo.
(cherry picked from commit 465aa55cea05172e9e8da8facf3f7107c722c0a2)
|
|
|
|
|
|
|
|
|
| |
This is commit 5650dbc55df (master) redone.
We cannot cherry-pick the original commit due
to lot's of conflicts ...
Reviewed-by: Thomas Hartmann
Reviewed-by: con
|
|
|
|
| |
(cherry picked from commit 2b2af66d5d18461b63dfd9c41a791ba182792695)
|
|
|
|
|
| |
Reviewed-by: Friedemann Kleint <friedemann.kleint@nokia.com>
(cherry picked from commit 3351f942f6630699660dc8b4a58fc60615fea125)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The UI_DIR and MOC_DIR weren't added to the includepath for new
projects, since at the time of parsing the directories don't exist yet.
We now always add UI_DIR and MOC_DIR to the include path, without caring
whether they exist.
Task-Nr: QTCREATORBUG-1064
Reviewed-By: ossi
(cherry picked from commit c58469ce8799fa87141660a1669b7c5639c9ad78)
|
|
|
|
|
| |
Reviewed-by: dt
(cherry picked from commit 994ee7b6f4a0492c6c84fb9bc31f80521baea21c)
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Remove PathChooser widget so that you need to use a proper dialog
to select pathes. So typing into that PathChooser is no longer slow;-)
The PathChooser does not provide a proper signal on when a user is done
entering a directory, so it was not a good choice.
Tasknumber: QTCREATORBUG-1128
Reviewed-by: dt
(cherry picked from commit 0e79aeed710311e28c45456f4f8ea5e66eec21b1)
|
|
|
|
|
| |
Reviewed-by: dt
(cherry picked from commit 6186e13057ef76411e4c09ef6045d28caa24e3c4)
|
|
|
|
|
| |
Reviewed-by: dt
(cherry picked from commit 86ca9f848406e1d5aba721273f409912b795ec99)
|
|
|
|
|
| |
Reviewed-by: dt
(cherry picked from commit 772c838aa339cc1192fd76463f68861613cd8e9c)
|
|
|
|
|
|
|
|
| |
If the same Qt version was imported twice then this was not
detected properly.
Reviewed-by: dt
(cherry picked from commit 75da336d79c6629c1a23db58035acada468044c2)
|
|
|
|
|
|
|
|
| |
* Fix a possible memleak while at it.
TaskNumber: QTCREATORBUG-1125
Reviewed-by: dt
(cherry picked from commit e6f43cbbe515f972dc1912f7594f7a988ee78deb)
|
|
|
|
| |
(cherry picked from commit 656899842cf6d662116ccfb3890e5672ff9869fe)
|
|
|
|
|
| |
Reviewed-by: hjk
(cherry picked from commit af3f10dfdd91b070512bdc8abda954bbb29396dc)
|
|
|
|
|
|
| |
Reviewed-By: hunger
Task-Nr: QTCREATORBUG-1036
(cherry picked from commit 0bd06f106467bb3ca551e319fe0db106902d5502)
|
|
|
|
| |
(cherry picked from commit 375dd56ef007d6d4d1c97532940229e8faf99f12)
|
|
|
|
|
|
|
|
| |
* Document the hariest regexp
* Simplify the parser a bit
* Catch "/usr/bin/ld: cannot find -lsomelib" (and others)
as errors.
(cherry picked from commit 8b969a67a0a300641779ba31f7c630dc5ab2ba2c)
|
|
|
|
|
|
|
| |
* "In blah method " messages are informative, not errors.
* Be more picky about file names: Stops errors from ranlib, rm,
etc. being reported as build issues.
(cherry picked from commit 879f71c2a35ab3f7f6286e88396455adca7ba847)
|
|
|
|
|
|
|
|
|
| |
* Do not report make warnings at all.
* Do only report the first make error.
* Do not report any make errors after a compile error.
* Handle more variants of mingw makes
* Actually parse stderr for errors
(cherry picked from commit f7335948bb739aa0b65b3ef69be4dd678f0925b7)
|
|
|
|
|
|
|
|
| |
Properly register Qt versions and do not delete them afterwards
Task-number: QTCREATORBUG-1122
Reviewed-by: dt
(cherry picked from commit 94cb5db5b9654dbcc8dd1968c919c4706ada0543)
|