Commit Graph

177 Commits

Author SHA1 Message Date
Tobias Hunger
a7bb77288d BC: Move builddirectory handling into BC itself
Use setBuildDirectory() in the different BuildConfigurations instead
of reimplementing that over and over again.

Change-Id: Ic355fdb4624c71667ce470b3e2865c9a8722ef09
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-28 11:41:38 +02:00
Tobias Hunger
52a41ecb0c Qt4BC: Simplify shadowbuild/builddirectory handling
Change-Id: Id46a239588d21b6aa5d4c43e4d85b52a04bd17ab
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 11:39:29 +02:00
Tobias Hunger
5422b2c4da Introduce Project::projectFilePath()
Use it instead of retrieving this information from the document.

Change-Id: I809fcb2daf59021cf503c371a5d40d75d7448796
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-01 11:42:41 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
Alessandro Portale
bf4c236531 More native dir separators in ProjectConfigWidget
Change-Id: Ia5da9d9a27fe3d2d67b9e7bb49d36e68923425a0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-15 16:34:25 +02:00
Friedemann Kleint
c0b6d1d3f2 Clean headers in Qt4ProjectManager.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I53fa1aafaf98fd3105ef35b595e4311854cf9cbc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-28 13:38:30 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
2013-01-29 15:52:36 +01:00
Tobias Hunger
47c3037c3d Qt4: Show correct directory in warnings
Show the source directory in warnings about the next build overwriting
things if using in-source builds.

Task-number: QTCREATORBUG-8585
Change-Id: Ie8b5dc36fdfefa399284f3d90d6901c90dda0033
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-21 15:31:27 +01:00
Daniel Teske
02b4b8c464 Qt4ProjectConfigWidget: Update build directory line edit on build
That line edit shows a red text if the directory does not exist,
building triggers a recheck and removes the red if the directory exists.

Change-Id: I50e87816a3e1b4ee9ef6ccb91e66eec8f7783242
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-17 14:49:58 +01:00
Tobias Hunger
63aed91b07 Remove some useless headers
Change-Id: Ic5ac0c4c5dc8bea3cf6012e96b24baac7b4ed208
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-14 12:14:59 +01:00
Daniel Teske
2819923daf Qt4Project: Check the Makefile after we know the right file
The .pro file can change the Makefile so we need to postpone the
evaluation until after the parsing is done.

Task-number: QTCREATORBUG-8154
Change-Id: I212899311354e67f711db0cb6a3a78f0c369bb81
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-14 12:13:19 +01:00
Eike Ziller
3e7d94c362 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
2012-11-16 15:31:02 +01:00
Daniel Teske
51bca85117 Replace BuildConfigWidge with NamedWidget
They have a identical interface.

Change-Id: Ia626496fbaffedefff6ee20b958cd505085d89f7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:26 +01:00
Daniel Teske
3ef968097f BuildConfigWidget: Make displayName property instead of a virtual func
To make the interface the same as NamedWidget.

Change-Id: I5961b4e5aa7f5acf3a7f83e82b6fa4266b9ebf97
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:16 +01:00
Daniel Teske
b5bbdb38d9 Remove BuildConfigWidget::init()
It no longer serves a purpose.

Change-Id: Icdcb69c87112e295cefd4975dfa2b3d65818365a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:09 +01:00
Robert Loehning
2394ceef6c Updated strings after target -> kit renaming
Change-Id: Ia686fdb377e2267c7687d6804c02b209402d6275
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-12 10:34:15 +01:00
Tobias Hunger
cc69195c6f Fix problemlabel from appearing wrongly
Fix problemlabel from appearing for people with heavily customized
build steps (e.g. those using qbs instead of qmake with a .pro-file
based project).

Change-Id: I5dcfff740270207b1ffa30cb083bd0e026801947
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-11 16:02:58 +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
Daniel Teske
03c65e62b7 Qt4Project: Fix updating of problem label on kit changes
Task-number: QTCREATORBUG-7873
Change-Id: Ief2ea0b7748eb003306fa2b6928dfded1e00ef43
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-19 16:30:15 +02:00
Tobias Hunger
05be9bbdf5 Fix lone warning icon
Change-Id: I94eab64442a89571dd0323f76cacda89cf39e309
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-19 12:08:11 +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
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
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
hjk
01b8f2ac8d qt4project: remove unneeded cast
Functionality is available in base class.

Change-Id: I795dd3ef0cf535e796b08a3671065b5121582c17
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-03 09:13:10 +02:00
Friedemann Kleint
455b677f8e tr()-fixes for 2.6
- 'profile' -> 'target'.
- 'qt version' -> 'Qt version'. Fix occurrences in comments as
  well to make grepping easier.
- Placeholders.

Change-Id: I451eae2f0571bccf1e75cf0def425a09fa80855b
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 16:14:42 +02:00
Friedemann Kleint
d1f8e120bf Fix messages in Qt4ProjectManager.
- 'can not' -> 'cannot'.
- Make messages about toolchain not being able to build for
  Qt version more verbose, listing the ABIs.

Change-Id: If72fec7ba08c7c0c9fb173a1f264691fc24c43dc
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 16:58:38 +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
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
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
Daniel Teske
713762e108 QtVersionManager::qtVersionsChanged() split list into add/remove/change
Makes it easier to do the right thing.

Change-Id: Id6c6754033b3310c6b8c68a4aacc22cbaef268ee
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-06 11:10:59 +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
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
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
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
Kai Koehne
046f25ea7b Fix gcc warning
Fix warning introduced in f8a1b94381

Change-Id: I94f603aa635161892ce0184777368026beb86539
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-15 14:11:07 +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
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
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
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
Eike Ziller
5bc6692ee5 Reduce number of categories and minimum size of preferences
Merges the Project, Qt4 and Tool Chain categories into one Build & Run
category, which makes it finally possible to reduce the minimum height
of the preferences dialog.

Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138
Reviewed-on: http://codereview.qt-project.org/5023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-29 16:26:48 +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
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
Friedemann Kleint
cc632c1597 Header cleanup in ProjectExplorer.
Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-18 13:47:33 +02:00
Tobias Hunger
70a2f91d77 Crash: Fix crash when importing broken Qt versions
Fix a crash when importing a build, using a qmake that is broken.

I ran into this crash with a 32bit qmake used in a pure 64bit userland.

Change-Id: I08acb8d5f2cd72c873a30be5e45324f6daef702c
Reviewed-on: http://codereview.qt.nokia.com/2181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-07-26 12:31:12 +02:00
Kai Koehne
8147973965 BuildConfiguration: Adapt name if Qt version changes
Change-Id: I1a34cb51f73af9779d6bdb07324d5dadcb5585b3
2011-05-25 13:22:55 +02:00
Friedemann Kleint
b8734dd727 Fix another crash when BaseQtVersion == 0.
Change-Id: I635bbc5c0120f8bf15b918ef8205cf72298720f0
Reviewed-on: http://codereview.qt.nokia.com/98
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-05-25 10:18:59 +02:00