Commit Graph

404 Commits

Author SHA1 Message Date
Tobias Hunger
1c4d51ef7a Add configuration option for default build directory
Change the UI to always show the editor for the build directory.
Default to what we do for qmake projects right now (with shadow-
building enabled).

Use this setting in qmake based projects.

Set this to '.' for in-source builds by default.

Change-Id: I3fb26ab817b0f545e9b318b68e592df8040d5562
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-21 13:25:56 +01:00
Tobias Hunger
75c36c9bb5 Gcc: Support -stdlib=whatever arguments for the code model
Switching the stdlib implementation is possible with clang and results
in different include pathes being used (and potentially different defines).

Change-Id: I9c856256f51ceded9dc7892c1dde2bcc8c1b024c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-21 12:48:12 +01:00
Daniel Teske
e08b38ffd6 Move Project::subConfigWidgets to BuildConfiguration
Change-Id: Idf58ebbb02e9cd0ab4ff7e74fbed17250e274693
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:40:00 +01:00
Aaron McCarthy
1b3909e45a Add option to place shadow build directory parallel to source tree.
This option requires that the projects directory setting is enabled.
For example with the following settings:

Projects directory: $HOME/depot
Build directory: $HOME/build

This will by default place the default shadow build directory in the
$HOME/build tree instead of adjacent to the source in $HOME/depot.

Change-Id: I74bfc00883d0479d5965350c760d14ef7602cc34
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-27 10:27:50 +02:00
Daniel Teske
95169eb8e3 Qt4Project: Do a build_pass evaluation
Some projects set TARGET or DESTDIR only in the build_pass

Task-number: QTCREATORBUG-4273

Change-Id: I3673dd93b37b10102a0c1f1ce053e1aef8aaf53f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-24 12:48:50 +02:00
Tobias Hunger
84c9402c5f Remove useless member from Qt4Project
Change-Id: Ifbe9219a5eeac8264d2aef74d791fc2f9206a9cf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-19 15:41:50 +02:00
Daniel Teske
4b3fdcb683 Qt4Project: Take control of target creation
Do the same thing as the targetsetupwidget would have done by default.
The Qt4BuildconfigurationFactory is only responsible for bcs that the
user creates on the projects page.

Task-number: QTCREATORBUG-8069
Change-Id: I708aace5055fcf2ad69d305347274d2e7d6dfbb6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-17 13:25:55 +02:00
Eike Ziller
59367be8d7 Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2012-10-16 17:42:20 +02:00
Eike Ziller
70b5e1f64d Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
2012-10-16 17:42:10 +02:00
Daniel Teske
9619ef7f75 Rename accidentaly renamed signal kitUpdated back to proFileUpdated
Change-Id: I48884e1efd7637fe8da6382c12bb9bfe4fbde1ee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-16 17:20:28 +02:00
Tobias Hunger
6a58e1b9fb Using target name instead of ID in shadow build dir
Task-number: QTCREATORBUG-7901
Change-Id: Ia38ea896809e7793439e412e260b7cdc409923da
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-12 16:13:11 +02:00
Daniel Teske
db022c9c8d Remove Qt4ProFileNode::updateUiFilesFromBuild
The function made sure that the code model knew about changes
to the ui_*.h files. This code was written before introducing
Qt4UiCodeModelSupport, which does ensure that the ui*.h files
on disk actually do not matter for the code model at all.
Removing this code improves switching Kits performance in some
cases.

Change-Id: I51f9fcc9cac23013eaf89a2a8517f2bd58953263
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 17:08:52 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
2012-10-09 11:50:17 +02:00
Andreas Holzammer
47ff91a584 Set executable flag on applications while deploying
Under Windows there is no executable flag in the filesystem.
So take the information that we got, which file
is an executable and set the executable flag if needed.

Change-Id: I0a7026911d1f7791434c39cc0917d6e49cfa1667
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-09 11:02:48 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Eike Ziller
a55d47544a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
2012-09-26 10:01:04 +02:00
Daniel Teske
a8d0b04f49 Show incompatible kits in Add Kit
And implement a tooltip for them

Task-number: QTCREATORBUG-7870
Change-Id: I4975dd24ca2b619ebcbd0393f97311590ed4930f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-21 15:57:44 +02:00
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6'
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
2012-09-12 17:27:37 +02:00
Orgad Shaneh
4ef2fbd4ce Profile -> Kit variable renaming
Change-Id: I6cc06684134030bd527d9dcce21ad17938a56927
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-11 17:08:52 +02:00
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
2012-09-11 14:02:03 +02:00
Tobias Hunger
e77bb8af04 Handle non-qmake projects without kits
Make it possible to add kits again after all kits were removed
from a non qmake project.

Task-number: QTCREATORBUG-7814
Change-Id: I38967cd4c106b95288b7020fe325d8cfe2688a7c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-07 14:20:48 +02:00
Eike Ziller
a8c524d40a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/wizards/qtquickapp.cpp

Change-Id: I6ece61c73bc32e93912ad1b489871c597ab60d5b
2012-09-05 13:42:31 +02:00
Orgad Shaneh
948abf10ae GCC: Actually use sysroot for header path detection
Function signature was prepared for that on
4c6b794774 but it wasn't really used

Change-Id: I1ee7059a00f0441d42a117b8f8d2c8c776d93815
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-05 12:18:33 +02:00
Eike Ziller
887456e38a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemoglobal.cpp
	src/plugins/madde/maemoinstalltosysrootstep.cpp
	src/plugins/madde/maemopublisherfremantlefree.cpp
	src/plugins/madde/qt4maemodeployconfiguration.cpp
	src/plugins/qt4projectmanager/librarydetailscontroller.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/plugins/remotelinux/abstractremotelinuxdeployservice.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp

Change-Id: I2560b528596f284e7b45a2260d8d3037891c5d17
2012-09-04 18:04:16 +02:00
Tobias Hunger
8ba422d07c s/profile/kit/
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 15:24:25 +02:00
Daniel Teske
867d655278 Qt4Project CodeModel: Use the project's mkspec not the qtversion's
They might differ if the user passes any -spec parameter

Change-Id: I9408541a09a6a687fdbae879bd1ab4c92e62aa1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-04 13:42:29 +02:00
Daniel Teske
72fd0a416e Qt4Project: Also cancel code model updates on partial .pro reevaluation
It seems that not doing that was intentional. But not doing that
looks like an obvious bug.

Task-number: QTCREATORBUG-7783

Change-Id: Ide7c7be6711f64f9e8b87bca2fe35cb2722aa589
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-09-04 13:41:37 +02:00
Daniel Teske
51433cbd84 QMakeProject: Set xqmakespec in addition to qmakespec
That's a workaround for not properly parsing the qmake command line.

Change-Id: I39e613b5419e8918b1120c6c2d782aab3b155021
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-04 13:40:22 +02:00
Oswald Buddenhagen
475fe8ec8b move sysroot out of QMakeGlobals
it's a hack which is exclusive to ProFileEvaluator.

Change-Id: I86141dc8985330a8a1602ced002545a9eb0a646c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 19:42:07 +02:00
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