Commit Graph

203 Commits

Author SHA1 Message Date
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
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
d30196daf3 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/utils/ssh/sshconnection.cpp
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp

Change-Id: Id0c9185638038f7506bc9507872d6699345414a9
2011-12-07 13:24:45 +01:00
Kai Koehne
fa0e63ca7a QMakeStep: Fix compilation warning
Remove unused variable.

Change-Id: I8e060a8569edfa34483497188d480e624fc2c5fe
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-11-28 10:38:21 +01:00
Tobias Hunger
e913ef737b Fix warning
Change-Id: I1b68ad0c97b630b95a6c47e6d0a0709c2a0872f6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-11-24 10:51:54 +01:00
Tobias Hunger
0ce9fa2c16 UI files: Do not polute the global Ui namespace
Make sure all ui-files are in the plugin's internal namespace.

Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-24 10:49:41 +01:00
Eike Ziller
fbd47e25ee Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
2011-11-18 10:16:49 +01:00
Kai Koehne
c86116da26 QML Debugging: Always name qmake step "Enable QML debugging"
We used to differ between Qt 4.7, where the step was "Link QML debugging
library", and 4.8. Let's just call the checkbox "Enable QML debugging"
for all Qt versions, which is easier to document.

Change-Id: I9bdffd75769a9d3c08efbf7471e00be46c9d9ed7
Task-number: QTCREATORBUG-6541
2011-11-15 16:00:36 +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
9fe7f65786 Show a more descriptive "Clean" or "Deploy" while doing that.
Change-Id: I706cf262e655c75f60008f78e660843d57bee345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-09 13:33:45 +01:00
Tobias Hunger
abbfc62f03 Move mkspec policy into the Qt4 targets
For embedded we do not want to override the mkspec as used in the Qt version
since that was most likely tweaked to work with the tool chain selected.

In a generic desktop target we want to be able to switch between different
compilers of the same ABI.

Change-Id: Ib49e54dd15e78c2459b17c552a3c31cb3dce63eb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-11-04 14:22:06 +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
Robert Loehning
998281c5c9 "Build Issues" was renamed to "Issues"
Change-Id: If514e2497a52456bfd16aaebf2a7c83def4621f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-25 11:57:10 +02:00
Daniel Teske
3cc1a2a914 Less magic in BuildStep::buildConfiguration() and deployConfiguration()
Where the deploy stuff depends on the activeBuildConfiguration it's
likely to be wrong or worse could be used to crash creator. So make
those places stand out.
Also if we ever move towards supporting meta-builds of multiple
buildconfigurations at once, then using the active build configuration
is wrong.

Change-Id: I754a77a4a8b352e79e8a6703c26ed41a189cf74e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-10-24 12:08:04 +02:00
Daniel Teske
8be83a173a Make sure we pass -after arguments after user arguments
Otherwise the user can't pass on normal arguments

Task-number: QTCREATORBUG-6346
Change-Id: I986563a75113a6d5acf601b5ccb63d6a35570bad
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-10-21 11:49:59 +02:00
Daniel Teske
3a449bdab6 Make Qt4ProjectManager::QMakeStep mulithreading safe
Change-Id: I41abb5e7138351e61c6c9dfc87121837edb21fbe
Reviewed-on: http://codereview.qt-project.org/5452
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-23 12:36:06 +02:00
Tobias Hunger
caa8bd454e qmake: Warn when using a mkspec that might not work with the tool chain
Warn when using a mkspec that might or might not work with the selected
tool chain.

Task-number: QTCREATORBUG-5854
Change-Id: Ifead5108ccd109f66707ad7aa371daead8cb57e7
Reviewed-on: http://codereview.qt-project.org/4522
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-15 14:19:01 +02:00
Eike Ziller
b0efd44d20 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
2011-09-15 11:50:29 +02:00
Kai Koehne
2d8acad3fc QMakeStep: Move recompilation dialog to QMakeStepConfigWidget
Change-Id: I20576fa99d9a1d04c24f9615317663e943619200
Reviewed-on: http://codereview.qt-project.org/4089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-14 11:24:45 +02:00
Tobias Hunger
aaf260c04b ABI: Improve tool chain selection for Qt projects
* Set a null-ABI for toolchains where detection of ABI failed: This
  allows the user to select any tool chain.

* Warn if ABI detection fails by showing a message in the Qt version
  setup dialog

* Do not override the mkspec if the Qt version has a null ABI only:
  We (have to) trust the user to know what he is doing in that case.

* GCC: Add version information to GCC tool chain and use it to select
  the mkspec on Mac.

* GCC: Do not override mkspec if we do a cross-compile
  (and actually detect that).

* GCC: Leave out -32 or -64 from mkspec if the compiler binaries ABI
  matches the target ABI.

* Linux-generic is compatible with all other linuxes (both ways)
  The targets themselves do additional filtering and will remove
  anything that does not work for them anyway.

Task-number: QTCREATORBUG-5756
Task-number: QTCREATORBUG-5960
Change-Id: Ib3c0ac91f3aa8e2a823e3e9891a02bdccb97af14
Reviewed-on: http://codereview.qt-project.org/4281
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-08 18:32:50 +02:00
Kai Koehne
14ee91dc54 Remove CONFIG+=declarative_debug from imported build line
Prevent CONFIG+=declarative_debug to show up in "custom arguments"
of an imported build.

Change-Id: Ib598addcb31b65853eea430a086f614c6dd498fd
Reviewed-on: http://codereview.qt.nokia.com/4044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-01 12:55:41 +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
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
Kai Koehne
a2c612c170 QMakeStep: Allow UI to update when asking user whether to recompile
Makes sure that the warning about security implications are visible
before the user answers whether to recompile.

Task-number: QTCREATORBUG-5411
Change-Id: I43fe6aeb9e24d25be4fb51f356b6238ce0cd3924
Reviewed-on: http://codereview.qt.nokia.com/1832
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-07-19 18:12:57 +02:00
Friedemann Kleint
a56162ec6e tr()-Fixes for 2.3: No contractions, spelling.
Change-Id: I08babdb15bcf7f7ac086e9e12955b780b7591391
Reviewed-on: http://codereview.qt.nokia.com/480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-06-14 17:18:48 +02:00
dt_
15e950d451 Fix makefile location check for qmakestep
Change-Id: Idf1842be4f8d7fe62b1569845b3f70ad1da32abd
Task-Nr: QTCREATORBUG-5127
Reviewed-on: http://codereview.qt.nokia.com/459
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-10 16:51:44 +02:00
Kai Koehne
2941045a9f QMakeStep: Ask whether to recompile if 'Enable QML debugging' changed
Task-number: QTCREATORBUG-4633

Change-Id: I4116e63da6633bebb21ba08084e2d8edde4fbd6d
Reviewed-on: http://codereview.qt.nokia.com/383
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-08 15:32:16 +02:00
Tobias Hunger
49fc36f8f8 Fix build
Change-Id: Idf8f0f367d329dad23d375bb08d3bc34bafe4115
Reviewed-on: http://codereview.qt.nokia.com/363
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-06-07 16:32:28 +02:00
Tobias Hunger
499a49b686 qmake: Skip running qmake when using non-default tool chains
Do not rerun qmake when using a tool chain which requires a
non-standard mkspec to be used.

Change-Id: I6171790805743251a7867111faa46bd4d4cc890d
Reviewed-on: http://codereview.qt.nokia.com/314
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-07 16:21:41 +02:00
Kai Koehne
be1dee195f Qt4BuildConfiguration: Fix naming of slot
Change-Id: I8b739afadd19e0f7c3503a11eb250a0662671958
Reviewed-on: http://codereview.qt.nokia.com/309
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-06 15:36:41 +02:00
dt_
2cc7bea066 Remove BuildStepConfigWidget::init()
It serves no purpose anymore.

Change-Id: Ifc15b29c7736bacde3b310e6c4dc980314145d14
Reviewed-on: http://codereview.qt.nokia.com/217
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-30 14:44:33 +02:00
dt_
6b0e6072f5 QMakeStep: fix linkDebuggingHelper
Just showing the widget was setting the linkDebuggingHelper setting.

Change-Id: I0188d713394e35c3519d9bbd822cb970363a68eb
Reviewed-on: http://codereview.qt.nokia.com/215
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-30 13:46:42 +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_
0d2313c555 Revert "Fix import of existing builds"
This reverts commit 8cd3b54949.

Conflicts:

	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qmakestep.ui
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp

Change-Id: I63af95b8dd7010c50318f276ef524c00a58995bb
Reviewed-on: http://codereview.qt.nokia.com/117
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-25 15:45:46 +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
Kai Koehne
a7426ca709 QmlDebugging: Enable linking the library automatically for debug builds
Change-Id: I31c6ce649ec5a106ac8d5a556659a26f584b1d09
Reviewed-by: dt
2011-05-18 11:47:49 +02:00
Tobias Hunger
32bc1c153c Fix possible crash in qmakestepwidget
Reviewed-by: dt
2011-05-16 18:26:18 +02:00
Kai Koehne
fd1af2e620 DebuggingHelper: Rename 'qtVersionsChanged' to 'dumpUpdatedFor'
Suggested by dt
2011-05-16 12:51:54 +02:00
Kai Koehne
b470bdc6e2 QMakeStep: Check whether Qt version is valid
Pointed out by dt
2011-05-16 12:51:53 +02:00
dt
9dea7a397b Fix crash in QMakeStep::allArguments
qtVersion can be null now
2011-05-16 12:18:20 +02:00
Tobias Hunger
f823791dfb Toolchain: Add clang toolchain
Note: Parsing of error messages is still missing. So Build Issues
      are not properly reported yet.
2011-05-13 15:57:40 +02:00
Tobias Hunger
df7aa6b578 ToolChain: Add support for mkspecs
Make the toolchains report their mkspec files and use the mkspec of the
toolchain if it does provide one. Fall back to the Qt version's mkspec
otherwise.

Task-number: QTCREATORBUG-4396
2011-05-13 13:34:43 +02:00
Kai Koehne
99911c5f3d DebuggingHelper: Keep state of different UI's for same version in sync
QtVersionManager got a signal 'qtVersionsUpdated(QString)', which the UI's in
QMakeStep & in the Qt Options react to.

Change-Id: Ib774332daf6cf008afb46914ebd839420cf23e25
2011-05-13 12:46:34 +02:00
Kai Koehne
6b25d6fbe1 DebuggingHelper: Always save output to 'General Messages' pane
Change-Id: I558c81f5a74d717dabb56d36fea3ed5f5b2acc18
2011-05-13 12:46:34 +02:00
Kai Koehne
91259db4fb DebuggingHelper: Always invalidate cached QtVersion information after run
Moving this to DebuggingHelperBuildTask / QtVersionManager makes sure
the version information is also updated if e.g. the QtOptionsPage has
been closed in between.

Also, update all Qt versions that share the same qmake path.

Change-Id: Idc23f6d9fa609e2a36f1d6d4cb09c6483afd4cc4
2011-05-13 12:46:34 +02:00
Thorbjørn Lindeijer
2b0266d0ee Disable observer and jsdebugger services when they're already part of Qt
As of Qt 4.8 the observer and jsdebugger services are part of Qt. This
means the following changes are necessary in Qt Creator:

* Do not link to the QmlJSDebugger library.
* Do not create JSDebuggerAgent and QDeclarativeViewObserver instances
  in the QmlApplicationViewer and use the new declarative_debug CONFIG
  option to enable those services in Qt. This is done automatically
  for debug builds.
* Point out the QML Debugging Library and the QML Observer are "Not
  needed" in the Qt options page.
* Change the label in qmake options from "Link QML debugging library" to
  "Enable QML debugging". It still remains as a way to enable this
  functionality in release builds or for QtQuick applications not based
  on Qt Creator's template.
* Rely on qmlviewer for debugging QML UI projects rather than the
  observer, which is no longer necessary.

Reviewed-by: Kai Koehne
2011-05-12 15:56:05 +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
Kai Koehne
6aa96bac9e QMakeStep: Save output of qmljsdebugger library build in General Messages 2011-04-29 15:08:44 +02:00