feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,990 Commits 108 Branches 368 Tags
e2b0835b58aefdab91edda097c1180dae08058f6
Commit Graph

281 Commits

Author SHA1 Message Date
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
Jarek Kobus
7edefec435 Compile fix for Mac 10.5.8 gcc 4.0.1 
Change-Id: I77a9ac922ead256c3c58be39ad0383aef67f3133
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-11-22 15:44:53 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
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
 2011-11-11 09:46:25 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
 2011-10-28 10:17:44 +02:00
Daniel Teske
b4a2612eb9 Fix leak 
Change-Id: I5d7b0faf4c0331eb88f75a2f778eaa71ca8fa10a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-27 17:53:06 +02:00
Daniel Teske
0af52c6b6a Simplfy code in ProjectLoadWizard 
Change-Id: Id77ff7681c31ccca5778bbe1eed5a341523c03c1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-25 18:29:19 +02:00
Daniel Teske
cc21572b64 Fix -spec parameter not used in profile evaluation nor code model 
Task-number: QTCREATORBUG-4723
Change-Id: I845326bdc8726c27502c66c5aeaacb0d286c54c1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-18 21:21:20 +02:00
Christian Kamm
3a110439e9 QmlJS: Only try qmldump on Desktop and Simulator Qt. 
In particular, don't complain about a missing qmldump binary on other
platforms.

Change-Id: Ie2e96bcb67e609aa5aed31510b06139d2d9ce77e
Reviewed-on: http://codereview.qt-project.org/5327
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-21 16:03:41 +02:00
Daniel Teske
57fa668bcd Add Qt4Project::proParsingDone(), which is emitted after parsing 
Change-Id: Id2eb1d2494438bac17f3104ee8a9ed56cc9b1db9
Task-Nr: QTCREATORBUG-6056
Reviewed-on: http://codereview.qt-project.org/4665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-19 13:45:06 +02:00
hjk
85bf185e2f qt4project: disable debug output 
Change-Id: I33ae40566677d9b80b27facddab25c1ee7905761
Reviewed-on: http://codereview.qt-project.org/5118
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 09:16:33 +02:00
Daniel Teske
aebcc3c75b Fix proFileUpdated signal 
Make sure it is always emitted if the parseInProgress state changes

Change-Id: I0e8dc6df5c68f14bd51885c078e909be10af8efa
Task-Nr: QTCREATORBUG-6057
Reviewed-on: http://codereview.qt-project.org/4657
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-16 14:38:07 +02:00
Christian Kamm
940fb1c4ab Qt4Project: Update code models if a folder watch changes the file list. 
Fixes: c861af529e

Change-Id: I7ed8afd52ab694d053788fac7f3e994898f2dd84
Reviewed-on: http://codereview.qt-project.org/4969
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-15 12:30:44 +02:00
Christian Kamm
c861af529e Qt4Project: Always notify the code models if the file list changed. 
Change-Id: Id795a363c9f990e9506eb35ed5a398948f93cf2f
Reviewed-on: http://codereview.qt-project.org/4967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-15 12:20:50 +02:00
Friedemann Kleint
ede672c8d9 Compile fix Windows. 
Change-Id: Ia9f9afaf77c000503512a19ef7e4f33ae9cca041
Reviewed-on: http://codereview.qt.nokia.com/3217
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-18 16:56:46 +02:00
Friedemann Kleint
d4e1d7c6ad Header cleanup in Qt4ProjectManager. 
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>
 2011-08-18 16:50:01 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3' 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
 2011-07-25 13:57:13 +02:00
Kai Koehne
d943015c76 DebuggingHelper: Use right toolchain 
Don't just use an arbitrary toolchain, which might break esp. for Symbian.
Instead, retrieve the toolchain from the project, or in the case of the Qt Options
page let the user choose.

Change-Id: I6d271c485420e609d223d8cece754ef84e573745
Reviewed-on: http://codereview.qt.nokia.com/1978
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-22 12:07:50 +02:00
hjk
82bbac7f90 Remove unneeded defines. 
Mostly Q_DISABLE_COPY that were covered by the un-copy-ability of the
respective base classes. Includes a few "stylistic" whitespace changes.

Change-Id: I31ca0e7bada5ed0f34776976efe22ddc444a5bf2
Reviewed-on: http://codereview.qt.nokia.com/1609
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-14 12:15:38 +02:00
Christian Kamm
4285b48455 QmlJS: Dump builtins per Qt version. 
Change-Id: I7b5179c4b33c24e83baf0536d158dd48d277637f
Reviewed-on: http://codereview.qt.nokia.com/1305
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-07-11 11:28:38 +02:00
Christian Kamm
99c38dde86 Qt4Project: Reset QML import paths in ProjectInfo. 
Previously, import paths would accumulate.

Change-Id: I2f6f12abde7906fc823323e4470af7a19afa304e
Reviewed-on: http://codereview.qt.nokia.com/667
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-23 15:13:25 +02:00
dt_
1c1521c3c4 Fix proFileUpdated signal, set correct parse in progress state 
Change-Id: I1f7ca269115491323373fe5c4230bd38860c08ce
Reviewed-on: http://codereview.qt.nokia.com/596
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-22 13:19:49 +02:00
dt_
2b31dbadcf Add a disabled reason to the display of runconfigurations 
Also distinguish between qt runconfigurations that are disabled
due to parsing and due to not being parseable

Change-Id: Ia8ce4eaa7b6bfcc2c5290b254bb288c6d4892170
Task-Nr: QTCREATORBUG-5103
Reviewed-on: http://codereview.qt.nokia.com/451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-14 11:58:39 +02:00
dt_
8ea4b9700d Qt4Project: fix canceling codemodel prevents codemodel update 
After a cancel the next codemodel needs to start regardless of whether
the underlying information is still the same.

Change-Id: I24eecaf2b8f5c96904002ca1e3dbe4df0061cc9c
Reviewed-on: http://codereview.qt.nokia.com/216
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-30 14:05:27 +02:00
Christian Kandeler
64ba06e221 Maemo: Create dedicated plugin. 
No change in functionality for now. More support for generic remote
Linux support is planned to be added.

The changes in decreasing order of magnitude:
1) Move contents of qt4projectmanager/qt-maemo to new "RemoteLinux" plugin.
2) Make some classes in qt4nodes public for now. More decoupling
in that area will follow.
3) Fix some minor problems uncovered by the move.

Change-Id: I51d0c7977c10019eb6080cd6620bc28ecebad3c4
Reviewed-on: http://codereview.qt.nokia.com/106
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-26 13:31:05 +02:00
dt_
5809bc0739 Qt4Project: updateFileList after adding files via the new file wizard 
Task-Nr: QTCREATORBUG-4976
Change-Id: I6d200a0b223e5a9aa601acbe6dbe064a5414b7dc
Reviewed-on: http://codereview.qt.nokia.com/118
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-25 15:45:57 +02:00
dt
754be1bcfc Move a lot of qmake independent classes to a new plugin qtsupport 
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.

Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-24 18:35:11 +02:00
Oswald Buddenhagen
9ac137fb06 add auto-saving of modified editors 
Task-number: QTCREATORBUG-2847
 2011-05-12 20:10:03 +02:00
dt
b4d38705a1 Fix whitespace/coding style 2011-05-12 12:25:25 +02:00
dt
8e171e0be0 Qt Version refactoring 
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.

Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.

Completly change the qt in path autodetection to be only
a fall back if no configuration was found.

Note: For now the old settings are not removed, as such 2.2 and master
can coexist.

Reviewed-By: hunger
 2011-05-12 12:23:06 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
8a9cbffea6 use environment from build config also when starting external processes 
this uses QProcessEnvironment directly, which is somewhat inefficient,
but it has no big impact, and it can be optimized on the qt side.

Task-number: QTCREATORBUG-2866
 2011-04-21 11:38:23 +02:00
Oswald Buddenhagen
dd0203e921 use environment from build configuration in the project evaluator 
Task-number: QTCREATORBUG-2866
 2011-04-20 21:23:23 +02:00
Oswald Buddenhagen
fae7dc9584 add errorString output argument to IFile::reload() & IEditor::open() 
add/unify read error handling in all affected classes
 2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
f1f9904d35 add errorString output argument to IFile::save() 
this centralizes error reporting (in fact, in most cases it adds any in
the first place).

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
1738d08ffc projectexplorer: move project{Context,Language} from IProjectManager to Project 
Reviewed-by: dt
 2011-04-12 12:46:26 +02:00
dt
b45a73ffab Use unique build directories per qt version and debug/release 
Reviewed-By: hunger
 2011-03-23 15:27:02 +01:00
Oswald Buddenhagen
16436a252b move command line args from ProFileEvaluator to ProFileOption 2011-03-18 21:28:04 +01:00
Oswald Buddenhagen
f8bc129055 remove pointless conditional 2011-03-18 21:28:04 +01:00
dt
4827d3aa7f Qt4 Maemo: Simplfy code for adding OTHER_FILES to .pro file 
Task-Nr: QTCREATORBUG-4085
 2011-03-18 16:36:53 +01:00
Oswald Buddenhagen
bcde880d92 make profile parse errors somewhat more visible 
pop up the error pane.
the evaluator got significantly better since the last time we tried this
...

Reviewed-by: dt
 2011-03-11 15:33:58 +01:00
Primrose Mbanefo
8d781af43b Introduce symbian ovi publishing wizard 2011-03-01 16:01:28 +01:00
Friedemann Kleint
562265d58c Toolchains: Header cleanup. 2011-02-28 16:50:14 +01:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
dt
f643ab8371 Qt4ProjectManager: Remove dead code 2011-02-22 20:17:41 +01:00
dt
811466a2fe Repalce QDir::absolutePath with QDir::cleanPath 
Qt 4.8 behaves differently.

Task-Nr: QTCREATORBUG-3849
 2011-02-22 16:27:06 +01:00
Tobias Hunger
8d0c477245 ToolChain: Refactor toolchain support 
Refactor ToolChains in Qt Creator:

 * Allow for several toolchains of the same type
 * Be smarter wrt. guessing what kind of output a toolchain
   produces. This allows us to eventually handle e.g. embedded
   linux setups way better than before.
 * Be smarter wrt. guessing what kind of environment a Qt version
   needs.
 * Improve auto-detection of toolchains a bit
 * Decide on which debugger to use based on the kind of output
   produced by the compiler.
 * Add options page to configure toolchains
 * Remove toolchain related options from the Qt version dialog

Reviewed-by: dt
 2011-02-21 18:33:23 +01:00
Christian Kamm
6b37fe19bc qmldump: Allow for debug and release versions and choose the right one. 
Task-number: QTCREATORBUG-3549
Reviewed-by: Kai Koehne
 2011-01-25 12:35:16 +01:00