Commit Graph

36 Commits

Author SHA1 Message Date
Christian Kandeler
e669f05406 Utils: Introduce HostOsInfo class.
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 17:00:03 +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
f3d49692eb Sanitize environment for buildsteps
Remove the paths that qtcreator.sh adds to LD_LIBRARY_PATH.
The linker uses LD_LIBRARY_PATH as a fall-back to find libraries,
leading to confussing error messages.

Task-number: QTCREATORBUG-7285
Change-Id: I1a2ba86e39f4c417b192d4faea4714165fdb4aac
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-02 12:21:01 +02:00
Tobias Hunger
e9e804888e Win: Avoid long creator startup times with '\' in PATH
Task-number: QTCREATORBUG-6501
Change-Id: Idfe050486db2d486e895bf6670cad3084871c44a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-22 11:31:42 +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
Friedemann Kleint
ac54974b32 Utils: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I5cd5607fcd3311915217a1615b948587ef808cfa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-06 09:31:14 +01:00
Jarek Kobus
062208fdf4 Add a comand line editor for environment variables
Task-number: QTCREATORBUG-6499

Change-Id: I43df7bddd10776e0fdb192c668ab0d99a6fea7e6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-07 17:48:55 +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
Kai Koehne
05be34f4c4 Mac: Fix compilation warning
Change-Id: Ib2d388c468bd88d1774770585fbf8a64de7cfb53
Reviewed-on: http://codereview.qt.nokia.com/1831
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-07-19 16:05:49 +02:00
hjk
c6f04ddf79 utils/environment: style
Change-Id: Ifbb9196d293205ab779294a22d0e5bd40faa887c
Reviewed-on: http://codereview.qt.nokia.com/84
Reviewed-by: hjk
2011-05-24 16:01:25 +02:00
hjk
d21645cc0d utils/environment: performance
Yes, showed up in callgrind.

Change-Id: Icb4fb9d8ed047eedf66e2e1a4bb2f24b9e217146
Reviewed-on: http://codereview.qt.nokia.com/83
Reviewed-by: hjk
2011-05-24 16:01:12 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Friedemann Kleint
fdb3b884ac Compilation. 2011-04-29 15:14:37 +02:00
dt_
f6148f6d45 Environment, expandVariables() can return native separators
Convert to '/' at the right place.
2011-04-29 13:39:43 +02:00
dt_
8304b96ae9 Evironment::searchInPath, no need to convert slashes
We assume that the input is normalized.
2011-04-29 13:28:21 +02:00
dt_
0811b24628 Revert "Fix setting of LD_LIBRARY_PATH in the run environment."
This reverts commit 4ba7f2b7f3.
2011-04-29 13:25:25 +02:00
Christian Kamm
4ba7f2b7f3 Fix setting of LD_LIBRARY_PATH in the run environment.
It's now only done if the *target*'s OS is of generic linux flavor.

Reviewed-by: con
Reviewed-by: Christian Kandeler
2011-04-29 10:59:18 +02:00
con
5096ff3df3 Fix build on Mac. 2011-04-29 10:27:11 +02:00
Christian Kamm
34e354c8fe Don't adjust DYLD_LIBRARY_PATH in run environments.
Reviewed-by: con
2011-04-28 11:36:39 +02:00
Christian Kamm
d7d23226ba Set LD_LIBRARY_PATH in unix run environments.
Similarly to how PATH is set up for Windows. The background is that
without it plugin loading can pull in incompatible Qt libraries if the
binary is compiled with RUNPATH instead of RPATH.

Reviewed-by: Daniel Teske
2011-04-28 10:44:57 +02:00
Tobias Hunger
ec671290e3 Use non-native separators internally 2011-04-19 16:30:57 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Tobias Hunger
e0d779a310 Env: Add method to get the difference between two Envs
Add a method returning the difference between two Environments.

Reviewed-by: dt
2011-02-15 15:32:20 +01:00
dt
b13ebc623c Utils::Environment::searchInPath do not return directories
Task-Nr: QTCREATORBUG-3736
Reviewed-By: Friedemann Kleint
2011-02-09 13:36:11 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
2010-11-17 13:19:07 +01:00
Oswald Buddenhagen
0641ed0eaa change Environment::expandVariables() semantics
instead of being os-agnostic, interpret the os-native expansion style,
so it is consistent with proper (shell) command lines.

don't interpret quotes, as this function is meant for expanding isolated
filepaths, where nobody would expect quoting. instead, use the windows
style of simply not doing an expansion if a referenced variable is not
found, which should be good enough - it's rather unlikely that something
which happens to be an expansion of an existing variable is actually not
meant to be one.
2010-11-17 13:19:06 +01:00
Oswald Buddenhagen
f0aa5cdabb Utils::Environment::find() => constFind()
it really is already that
2010-10-19 19:12:45 +02:00
Tobias Hunger
ac2f0f1ca3 Environment: Fix crash searching executables in windows 2010-10-18 11:10:55 +02:00
Tobias Hunger
1ff6f940fc Environment/Win: Handle extensions when looking for executables
Properly handle extensions when looking up executables in the path
on windows.
2010-10-15 18:28:19 +02:00
Tobias Hunger
ad008b9b57 Environment: Disable escaping when expanding variables
This breaks too much on windows.

Reviewed-by: dt
2010-10-08 14:30:26 +02:00
Tobias Hunger
e851684e9d Environment: New method to find an executable
Add a method to find an executable:
 * Expand environment variables
 * If relative: Check provided directories
 * If still not found: Check the path

Reviewed-by: dt
2010-09-24 16:35:03 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment
Reviewed-by: dt
2010-09-23 13:40:26 +02:00