Commit Graph

324 Commits

Author SHA1 Message Date
Oswald Buddenhagen
f4f1f968c5 make command line parser grok more options
-spec/-platform, -xspec/-xplatform, -t/-template, -tp/-template_prefix,
-cache & -nocache.

Change-Id: I1a0aa6ce830bf4d4beed319ebe248b15b2dc72c0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:54:11 +02:00
Oswald Buddenhagen
07a7cad50b revamp command line argument parsing
the command line parser can be now integrated with a parser which
understands more options.

Change-Id: Ib9de352376b2f03dd466d577435f680702d1e2b9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:54:01 +02:00
Friedemann Kleint
edf4a975df Fix warning about disconnecting from 0 when importing a project.
Change-Id: I2b2edbad5b59fdad8a537c82d675cdc8b59eaa82
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-27 15:14:44 +02:00
Daniel Teske
36f6c02f1c Remove evaluateBuildSystem signal
It adds almost nothing and introduced some bugs.
This fixes:
Double evaluation in cmakeproject on build directory changes.
Wrong runconfiguration update in cmake for set_target_properties(target
PROPERTIES OUTPUT_NAME [..]) changes.

Unecessary runconfiguration removal in AutoTools and Generic projectmanager.

Reevaluation of .pro files on changing the active runconfiguration or deploy
configuration.

Task-number: QTCREATORBUG-7723
Task-number: QTCREATORBUG-7761

Change-Id: I50249b186917cd3a4f399f187f09ac8428ab6f9e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 12:13:48 +02:00
Daniel Teske
8d8ab020b1 Make buildDirectoryInitialized a Qt4Project specific signal again
And fix it to the old behaviour while at it.

Change-Id: Ifd786e085c621fb3cd59b98cc665d9e3c7fcce51
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 12:13:36 +02:00
Christian Kandeler
6cc7d1ffaa Provide build system independent deployment data.
Attach an object containing deployment information
to the target. The respective build system plugins are
responsible for setting up this information. The
Qt4ProjectManager already does that; others should
follow (which is expected to result in gradual
refinements of the design).
The immediate motivation here is to free the
RemoteLinux plugin from the requirement that
qmake must be used for building the projects,
which makes it much less generic than it could
and should be.

Change-Id: I9943787f4e352d014e721082016542b10c8cce90
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-22 12:15:31 +02:00
Tobias Hunger
294b813484 Do not create Custom Executable RunConfiguration
Task-number: QTCREATORBUG-7640

Change-Id: If8ed8545657783ad0d18e60b64d08e7d92e105d3
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-06 14:06:37 +02:00
Oswald Buddenhagen
187751f967 add $$shadowed() function
follow suit with qmake ...

Change-Id: Ic97576eaf74dfd58e8d8cd2f8034dac3963b92c4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:42:39 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Daniel Teske
f9923a30be Qt4Project: static_cast not qobject_cast
Change-Id: I76483e6aae8b5144f9f896b3c60795e3ae5ade11
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:41:02 +02:00
Oswald Buddenhagen
0e6f6e3ca5 make $$QMAKE_QMAKE available to projects
not setting it outside the main project processing, as it's even less
likely to be needed there.

Change-Id: Ia7afe3a53bf0977d739bf23d7cd79e3a2aee8867
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:17:36 +02:00
Oswald Buddenhagen
5e596e89d0 introduce qmakeProperty(), use instead of versionInfo() where applicable
the idea is to encapsulate accesses to specific variables.

Change-Id: Icafd2c85de6178db1a492a5dd36dde7f1925ea21
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:15:30 +02:00
Oswald Buddenhagen
da26368d9e make qmake property map ProString-based
Change-Id: I3c25642b885171a47e8fd27e39e5d470d9f24db3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:14:40 +02:00
Oswald Buddenhagen
37b2f88e27 ProFileOption => QMakeGlobals
more accurate class name

Change-Id: I4258b221727e79cc88d5f57dd1f6631ba0bba625
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:04:29 +02:00
Daniel Teske
abb210e719 Fix crash on unloading project
Note: A additional change merged from 2.5 is needed.

Task-number: QTCREATORBUG-7524
Change-Id: I9cbbfaff40f5ddeba743cdb258e7cece64d2ad85
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 11:45:12 +02:00
Tobias Hunger
bf880ee8b0 Remove unused member variables
Change-Id: I60b95723813cc660d7907fa6f06c6452dc959fe4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-29 13:57:40 +02:00
Orgad Shaneh
dc251deccf Project: Fix crashes
Task-number: QTCREATORBUG-7563

Change-Id: Ib7630e9ca82a0b09703ff948af95af53ced05730
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-25 10:23:32 +02:00
Tobias Hunger
2431456216 Profile introduction
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:12 +02:00
Eike Ziller
e3c354d8f2 Make PluginManager mostly static.
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-19 16:11:40 +02:00
Tobias Hunger
5a79945ef6 DebuggingHelper: Move to QtSupport
* Move debugginghelper to QtSupport. ProjectExplorer should not start
  looking for Qt versions!
* Make autotools and generic project plugins depend on QtSupport

Change-Id: If28418a85e3696cba713e66148c893a5a9b6adc7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-18 15:48:26 +02:00
Daniel Teske
d05d697ab3 Catch a few common errors for failing .pro parsing
Task-number: QTCREATORBUG-7377

Change-Id: I43e1393acc09ee4fd923d6796b4a0298fb22ea71
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-09 14:38:16 +02:00
Daniel Teske
1a9b436cc1 Qt4ProjectManager: Cleanup TODOs
Change-Id: I3c274c5b9aa37e14d74da3276d7012983f14fc89
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-03 16:27:55 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-25 11:49:19 +02:00
Oswald Buddenhagen
822233629d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
2012-04-19 16:13:09 +02:00
Daniel Teske
2be819c89e Qt4Project: cpp code model add <configuration> and headers
This makes the data which we pass on to the codemodel similar again to
before 3aab8beaf4

Task-number: QTCREATORBUG-7198
Change-Id: I40a4812b27b69efd788abc85532efbdda1bef7d6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-19 15:49:14 +02:00
Daniel Teske
2176599e74 Remove Project::dependsOn(), it's never called
I don't remember why I did leave it alone in the reafctoring some years
ago, but surely it serves no purpose.

Change-Id: Idf920faf3f8f7128cd410501f2c3748e100dfbfb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-16 11:28:00 +01:00
Erik Verbruggen
f1b2100e34 Move the ModelManagerInterface out of the CPlusPlus library.
Change-Id: Iffaa18f848a22f6961b49dff048672b194570df6
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-03-14 11:46:24 +01:00
Daniel Teske
6f45ec97f8 Automatically configure examples opened from the welcome page.
Each example can now provide a list of platforms by the examples manifest
.xml file. This list can control the target configuration of the example
when it is opened in the welcomepage.

Change-Id: I893230fd2850b7a1272db71a7f589044d52041d1
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 15:28:28 +01:00
Robert Loehning
b41171c847 Normalized connect()s
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-06 12:46:52 +01:00
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
010db47040 Fix crash for unconfigured setttings and no qt version
Change-Id: I1f4ff490d57053ce33853214e46a1beb444cbaa3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-02-07 13:46:29 +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
Daniel Teske
000a2b8861 Don't remove unconfigured custom executables on async parses
Only do that on loading the project.

Change-Id: Ibe5ef1188e30d0743a3d10caeb4a98ac5f5ee95d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-26 15:48:20 +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
Eike Ziller
9a0636f7a9 Merge remote-tracking branch 'origin/2.4' 2011-12-13 15:25:20 +01:00
Daniel Teske
9fb2a23a31 Fix a crash on closing a project while a parse is in progress
Task-Number: QTCREATORBUG-6677

Change-Id: I01dd37fabafd8cd056cd4051b8377c6167453cb6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-08 12:29:44 +01:00
Daniel Teske
f5d4287123 Use Utils::FileName for various bits in QtVersion
Change-Id: I3afc3a4f2e0dd2671279c2d071779f1d7b277849
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-07 15:05:31 +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
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