Eike Ziller
e2b0835b58
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljstypedescriptionreader.cpp
src/plugins/analyzerbase/startremotedialog.ui
src/plugins/qmldesigner/designercore/include/rewriterview.h
src/plugins/qt4projectmanager/makestep.cpp
Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
2011-11-25 09:48:25 +01:00
Friedemann Kleint
65c7d92531
Fix test compilation of dumpers.
...
Do not define USE_QT_GUI.
Change-Id: I9af5659d26f6a4634109987a1e69454348f730a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
2011-11-24 14:07:12 +01:00
Oswald Buddenhagen
c344032bd5
centralize setting of "CONFIG += shared dll" for libraries
...
"dll" and "shared" set each other, but too late to actually test for it
in the project files, so include both.
note that this will slightly modify the build of some of our imported qt
solutions.
Change-Id: I0bd4f41a68fd160f8e87eb0a0fa66096fe70ef3e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com >
2011-11-18 10:40:09 +01:00
hjk
fda652a43e
debugger: rename gdbmacros* to dumper*
...
Was mis-named from the beginning.
(cherry picked from commit 2f119dc2f85b28274d47ff635188872d5ed11521)
Change-Id: I4f2e388edfdded117c5b35d3d04bbdc68d77afa4
Reviewed-on: http://codereview.qt.nokia.com/872
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: hjk <qthjk@ovi.com >
2011-06-29 10:21:55 +02:00
hjk
d8b589ceff
debugger: remove QtGui dependency from debugging helpers
...
It was only used for the watch-QImage-while-it-is-being-drawn-on feature,
which does not seem overly useful.
2009-06-18 13:39:19 +02:00
Alessandro Portale
97b3e71d08
Rename qworkbenchlibrary.pri to qtcreatorlibrary.pri
2009-05-08 16:42:48 +02:00
Oswald Buddenhagen
e3885f280b
use IDE_APP_PATH more, introduce IDE_LIBEXEC_PATH
...
IDE_LIBEXEC_PATH is still the bindir, so it's kinda fake. oh, well.
2009-05-06 20:25:20 +02:00
Oswald Buddenhagen
97ffee6bdd
automate setting IDE_BUILD_TREE
2009-05-06 20:25:20 +02:00
Thorbjørn Lindeijer
039024e727
Fixed an exotic linker issue on gcc 4.1.2
...
Reviewed-by: dt
2009-04-20 15:48:58 +02:00
dt
030beabd64
Also apply the fix for the dumper here.
2009-04-17 16:51:49 +02:00
hjk
bb3e6b720c
debugger: rename data dumpers into "debugging helpers"
2009-04-07 16:39:47 +02:00
hjk
d259c4292a
Fixes: debugger: build dumpers into "global" lib, too
2009-03-11 15:44:53 +01:00
