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
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
Christian Kandeler
3d9e492860
Do not use the fromAscii() and toAscii() functions.
...
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.
Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2012-09-21 21:03:48 +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
Orgad Shaneh
79d3771e1d
QtCProcess: Use native separators for command
...
Change-Id: I2da749ce7b9233497d2d611163b95ad7b7ba28bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-04-16 11:52:15 +02: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
Daniel Teske
fd19e94e35
Set LD_LIBRARY_PATH/DYLD_LIBRARY_PATH to empty if not set at all
...
Work around qt being stupid.
Task-number: QTCREATORBUG-6583
Change-Id: I9443adea0b2be7e4d26d70ab817858d71fa1bbdb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2011-11-28 11:19:02 +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
Joerg Bornemann
26bc6c4d39
fix incomplete renaming of qtcbuildhelper to qtcreator_ctrlc_stub
...
Change-Id: Ie70c61770efc056c70a84c298100fec33295afb5
Reviewed-on: http://codereview.qt.nokia.com/2945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2011-08-15 12:25:38 +02:00
Joerg Bornemann
6e93b47c33
QtcProcess: Windows compile fix
...
Change-Id: I5f5882fe4ae2ab84c6e5668c560290b6b0cd30c7
Reviewed-on: http://codereview.qt.nokia.com/2942
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com >
2011-08-15 11:13:49 +02:00
Oswald Buddenhagen
65317deaf9
move qtcbuildhelper where it belongs and rename it accordingly
...
this is not a creator tool, but a helper of qtcprocess, just like the
existing stub.
Change-Id: Ice7c60a1dee0b132c6063747f82ea35699f4127d
Reviewed-on: http://codereview.qt.nokia.com/2918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com >
2011-08-15 10:42:00 +02:00
Oswald Buddenhagen
72465c45e3
unscrew argument quoting in qtcbuildhelper call
...
Change-Id: I4f389e32d540d49e886e7db02b6332d2ad2372f7
Reviewed-on: http://codereview.qt.nokia.com/2916
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com >
2011-08-15 10:37:54 +02:00
Friedemann Kleint
1f13482f69
Yet another compile fix for MinGW/Windows.
...
Change-Id: Iea0d998de254d26e15a8703812b3aad8399721a8
Reviewed-on: http://codereview.qt.nokia.com/2777
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
2011-08-09 13:44:37 +02:00
Friedemann Kleint
538ca05d22
Compile fix.
...
Change-Id: I046ae871ef482bf36ee21ba77abd706292a15d3f
Reviewed-on: http://codereview.qt.nokia.com/2768
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
2011-08-09 11:03:02 +02:00
Joerg Bornemann
566d29f8b3
Use qtcbuildhelper for starting the build process on Windows.
...
Task-number: QTCREATORBUG-4558
Change-Id: Ib6f5be80f034135bbd8c45a22e223e758cc7e7b1
Reviewed-on: http://codereview.qt.nokia.com/2555
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com >
2011-08-03 14:02:41 +02:00
Oswald Buddenhagen
600127e875
fix quoting of strings with spaces and backslashes at the end
...
the regexp would match twice at the end, and thus insert a stray quote.
so use a discrete loop instead.
fixed the same thing in proparser/ioutils and consoleprocess before ...
Change-Id: I62b80fb4ea68e00145861f289bc13440c5078873
Reviewed-on: http://codereview.qt.nokia.com/1302
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2011-07-07 12:16:09 +02:00
Tobias Hunger
aa2acec14c
Fix/add copyright headers
...
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
dc3c156cac
Merge branch '2.2'
...
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
con
1c2da511b9
Merge remote branch 'origin/2.2'
...
Conflicts:
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
2011-04-01 09:53:09 +02:00
Oswald Buddenhagen
4e894f14c0
support tilde expansion under unix
...
Task-number: QTCREATORBUG-4239
2011-03-28 15:25:01 +02:00
Friedemann Kleint
0e89104b45
API Documentation: Fix warnings.
2011-03-28 14:58:12 +02:00
Friedemann Kleint
505256fab9
API-Documentation: Add the Utils-library.
...
Fix API after doc template change.
2011-03-02 17:14:19 +01:00
Friedemann Kleint
9ea68e7805
Toolchains: Fix MSCV.
...
Need /E:ON, V:ON for cmd.exe, do not pass empty environment
to QtcProcess.
2011-02-28 10:15:49 +01:00
con
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
23c22b7c66
License headers, part 2
2010-12-17 17:14:20 +01:00
Christian Kandeler
6e1c4c8e9c
Fix compilation for namespaced Qt.
...
Reviewed-by: Oswald Buddenhagen
2010-11-17 17:42:56 +01:00
Oswald Buddenhagen
531c70f05b
add Utils::QtcProcess
...
this is a wrapper around QProcess with these features:
- setEnvironment() takes a Utils::Environment instead of a QStringList
- instead of taking a stringlist with arguments, take a single shell
command string which is fully compatible with the system's native
shell (the bourne shell on unix and cmd.exe on windows) - with support
for environment variable expansion, and subject to the shell's
splitting and quoting rules. if the command is too complex (e.g.,
contains redirections), it is transparently executed through a real
shell.
- additionally, the class contains a set of helper functions for
manipulating (constructing, splitting, etc.) shell command lines.
in particular, it contains a shell-safe macro expander and the nested
class ArgIterator which can be used for inspecting and manipulating a
shell command line without going through the stringlist indirection
(which is potentially lossy).
some of this is based on KDE code (KShell and KMacroExpander) which i
have written myself.
2010-11-17 13:19:07 +01:00