feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
23,249 Commits 108 Branches 368 Tags
630ff22d613d1db8e601d88996e25301fecdb1a4
Commit Graph

249 Commits

Author SHA1 Message Date
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-20 13:32:49 +01:00
Erik Verbruggen
3aab8beaf4 Supply c++11 flags and per-project info to c++ code model. 
A manual squash/merge of the changes below, plus a couple of subsequent
code fixes.

59085aa5fbb99e2d786cd2c1a06c24a111ccb49f:
    Modify CppModel::ProjectInfo

    Adding per project node information, to pass on the correct
    defines/includes for each file, instead of aggregating them incorrectly.

    Also split up SOURCES and OBJECTIVE_SOURCES.

    Also ask the toolchain to convert the compilerflags to flags the
    codemodel understands, for now only gcc and only c++11.

    Also make the toolchain aware of the flags used to compile, so that it
    can emit the correct defines.

    Note: No header files are passed on.

74028802314cd4e75b41b46407433e07090a304d:
    GCC: Evaluate cxxflags when checking for predefined macros

ebaaa4957e4c02cc9637a998eddae1d0acd74f83:
    MSVC: Take cxxflags into account when checking for predefined macros

9bfce7e889bcf7bcc47bf880e3ea25945ca7d0d7:
    Compile fixes

Change-Id: I9de94ad038dfc5dc1987732e84b13fb4419c96f5
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-02-16 15:17:17 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
Eike Ziller
f916d38dce Make IFile::isReadOnly consistent. 
It is supposed to refer to the property of the file on disk (if there is
any).

Task-number: QTCREATORBUG-4998
Change-Id: Iaed62c17d124b364aecec4d1f910046bade42d40
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-14 12:58:11 +01:00
Friedemann Kleint
622cac50f4 Move QtConcurrent library into Utils. 
It causes a conflict with the new QtConcurrent library
of Qt 5 and is quite small.

Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-09 12:33:10 +01:00
Daniel Teske
e3d14f7c39 Make Open Project wizard skippable 
Task-Nr: QTCREATORBUG-6063

Change-Id: Ieace3e9e68b4e0342c35ac7c279f4b0b61076419
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-02-03 09:36:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
21c0cdee40 Core::Filemanager: make some methods static 
This follows suit to the ICore changes.

Change-Id: Iba2de1b1e3f2574fd1459892eae702e6af1cc7dc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-25 19:23:11 +01:00
hjk
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +01:00
Friedemann Kleint
80d3f73319 Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII. 
Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-14 21:13:41 +01:00
Jędrzej Nowacki
500a995930 Don't follow symlinks to directories. 
Symlinks may create a directory loop, causing QtCreator to hang.

Change-Id: I701811bc2cc6d3c9efd8b51c1b80c7e5b4aa06ea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-01-06 13:41:53 +01:00
Daniel Teske
f8a1b94381 Don't react to profileUpdated on failure or while still in progress 
Change-Id: I88fa7b7e3165d3b89af4e68a1b1c17082f29510a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-08 12:30:18 +01:00
Daniel Teske
e9c079a648 Add FileName isChildOf/relativePath and endsWith and appendPath 
Needed by qtversionmanager

Change-Id: I4d455298e809b744ae3663493914db6e31f372a6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-12-06 15:54:24 +01:00
Leandro Melo
a985759757 Add . to includePaths() for qt4project 
QMake implicitly adds it, so we need to do the same.

Change-Id: Ifa1733e79f8eaa8461906fe23f492fc6e83ad017
Done-by: dt
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-29 16:50:36 +01:00
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
Daniel Teske
b0ec3c130e Use Utils::FileName in Qt4ProFileNode 
Change-Id: I6c0702caa2259e8fcaae48d1ac91622398ce7696
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-09 12:26:46 +01:00
wongk
ecfb958137 Don't add superfluous newlines to qmake project files. 
Task-Number: QTCREATORBUG-5635

Change-Id: If12d6028b41b962e29d4aff38af3ea7ebd0eae41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-04 18:03: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
Daniel Teske
7c9b748f22 Fix double showing of files 
Task-Number: QTCREATORBUG-6378

Change-Id: I07983b4201f6c06c3dc823527ba6299101ca50f5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-11-01 17:13:45 +01:00
Daniel Teske
5d91afda34 Fix bug with unclean paths with multiple .pro files in the same dir 
Task-number: QTCREATORBUG-6414

Change-Id: Idb9277e951270688766b1e569c7ae0f962b2e4c3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-27 15:23:35 +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
Oswald Buddenhagen
0164e1bea2 Merge branch '2.3' into 2.4 
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
 2011-10-18 13:50:38 +02:00
Jure Repinc
fa4db8d045 Fixed some typos and added some missing ellipises 
During translation into Slovenian I noticed some typos in original
string. For example some missing ellipsis characters and some
incorrectly spelled MeeGo names (as Meego)

Change-Id: I48eaa95303f1e82ab9893f713056382e8daaef41
Merge-request: 2200
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-05 20:14:59 +02:00
Tobias Hunger
ffa88df344 Toolchain: Allow all tool chains 
Allow all tool chains if either the Qt version is invalid or
no Qt modules are not selected.

Change-Id: I9842c30aca0a8752915548dc258f257c3fd39e4d
Reviewed-on: http://codereview.qt-project.org/4990
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-23 14:02:59 +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
Daniel Teske
c083bded23 Export Qt4PriFileNode 
Change-Id: I4e6dd89a8ddd95aa21ebf5555c05349f541bd83e
Reviewed-on: http://codereview.qt.nokia.com/4335
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-07 12:10:03 +02:00
Daniel Teske
6b1bc495a0 Add Qt4PriFileNode::subProjectNodesExact which uses the exact parse 
Change-Id: Ic6b8dedbc31830295e3dccea82c5f6514840dc57
Reviewed-on: http://codereview.qt.nokia.com/4282
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-07 12:09:49 +02:00
Daniel Teske
31739dc0f7 Fix paths to install files 
Change-Id: Icc7202c543166c54c5ef5e6d327726454dee3c60
Task-Nr: QTCREATORBUG-5789
Reviewed-on: http://codereview.qt.nokia.com/3339
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-08-22 18:59:10 +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
Daniel Teske
d0de83d9bd Fix project tree, reported on irc 
Reviewed-By: Trust me
Change-Id: Iba035da372a2d005aa1fbf592b29da6b1176c352
Reviewed-on: http://codereview.qt.nokia.com/961
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-30 18:02:56 +02:00
Daniel Teske
5c75f295e9 Also filter files found in OTHER_FILES for qml 
Change-Id: I85f6958017d18a868bd63745efdd850cabb43761
Reviewed-on: http://codereview.qt.nokia.com/902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-06-30 13:12:24 +02:00
Aurindam Jana
8668fb776f Check QMLType when adding new QML files to project to prevent error message being shown 
Change-Id: I68df3c69b535d47109bfb94c3089fd78e8b3683d
Reviewed-on: http://codereview.qt.nokia.com/514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-27 14:59:51 +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
Leena Miettinen
f1889864db UI text: check capitalization and tooltips 
Change-Id: I3686ac83e5fdc009b03e84ab3c7b24a052d119c4
Reviewed-on: http://codereview.qt.nokia.com/569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-22 10:05:33 +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
Tobias Hunger
95a51ceca8 Qt4: Remove dead code 
Change-Id: I3c3575670720fafa1b81d553abaad81303836379
Reviewed-on: http://codereview.qt.nokia.com/351
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-07 15:00:03 +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
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
Christian Kandeler
4678208c3a Qt4ProFileNode: Add project version information. 
Reviewed-by: dt
 2011-05-13 13:55:05 +02:00
Oswald Buddenhagen
9ac137fb06 add auto-saving of modified editors 
Task-number: QTCREATORBUG-2847
 2011-05-12 20:10:03 +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
dt_
c450abfe3f Symbian: Correctly ignore certain deployment rules 
Reviewed-By: Pawel Polanski
Task-Nr: QTCREATORBUG-4840
 2011-05-11 13:48:04 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Christian Kandeler
e751a135db Project File Parsing: Add support for new "aux" template. 
Reviewed-by: dt
 2011-05-05 17:44:27 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
Oswald Buddenhagen
b950d7aea6 remove empty line truncation from pro editors 
it's bogus. and the ProWriter will take care not to add stray empty lines now.
 2011-04-18 14:10:15 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling 
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:14 +02:00