| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I4262a5ff65f72e11f2bff0f7edae802aba9b1082
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: Ieba84f1c8ff1d33af3a6939a10de06848091963e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: Iaacd1793497a836ae7ddab7f7f6de34b89cf51d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I6f3fdea94d4f1e25513d976fd8ef18c395d8fa7b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
| |
Change-Id: I9be7fde5b69b65e759100efb0595e7ca2ac5bfb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
| |
Change-Id: I779a7c3a12d03f0d1920c89b38b019b81502712b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: Iceded20db5c4d18b3ae075f99faacb351967277c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: Id327afba79a865cf64b64fd817efe5c8b8797043
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
| |
So it can be set through .qmake.conf in a subdirs project above it.
Change-Id: I53c7ba96c1df916b7c81c816ec0559a1e147a84b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
| |
Change-Id: I9ddcc193b4d927c3d566eeb81c41f79a75920696
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
| |
Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
|
| |
| |
| |
| |
| | |
Change-Id: Ied926ed78f24d06ff0ff693d768e12ecb505ccbf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |
| |
| |
| | |
Change-Id: Ibb0d0d64f379684b1ae8f7cd55a8a5436056432b
|
| |
| |
| |
| |
| | |
Change-Id: Iea998510555e3762e6a8457bb6e998c3533c2dee
Reviewed-by: David Schulz <david.schulz@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I91752859f790b5576db7ec8678c58924f643187c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I88d6f99a1fa714386337589e1edda66b66091151
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
|/
|
|
| |
Change-Id: I005fb91b5e3cd5956edb108d0ec730db64cc98e9
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
|
| |
| |
| |
| |
| | |
Change-Id: Ie852069d4c3f01eb021837644865fdea41a34c54
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Setting QTC_PLUGIN_DIRS as an environment variable is easier
to manage than passing it every time explicitly to e.g. the qmake
call. It also is in line with other environment variables used in
Qt Creator, like WITH_LLDB, QT_BREAKPAD_ROOT_PATH etc.
Change-Id: Ief94aaf7c2a16ee62dcbf27c9f217496b1f74ad5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This allows us to profit from the Qt extensions for C++11, and also
makes sure e.g. QTC_OVERRIDE is consistenly checked. We can't enable
it (yet) for Mac/release though to be able to deploy to 10.6 ..
Change-Id: Icd26ab5f971532ff10a892221c653987026ac88d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Change-Id: I1ef1f20d776f955c2f08d551dbac1621b98c0961
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
share/qtcreator/debugger/stdtypes.py
src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp
Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Do try to resolve plugin_dependencies.pri files in all directories
set by QTC_PLUGIN_DIRS. Also fail if a dependencies_pri file cannot
be resolved.
Change-Id: I2c14db832cef0fcc97a2f0351847c4969f5bd420
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |
| |
| |
| | |
Change-Id: I9bf6bbeefcfce9759f8b10e0d5dfb9864315beb4
|
| |
| |
| |
| | |
Change-Id: I124bfc5ed26f2d64028c72e89539c16d5d3836be
|
| |
| |
| |
| |
| | |
Change-Id: Id68423b08a6f7e0d295e7b065d7c50d25f914541
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ice27f5cc433f436cdb0445b14ba2902c601d5295
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I0ea3a31a430cae57e72fc1be6e9305d56597d503
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ibb586513f256deb5e0e8aa7c5100055482a031a9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|/
|
|
| |
Change-Id: I6d0e52f57fe0e2c762ba12a9ed86de2458463772
|
|
|
|
|
|
|
| |
Makes startup times with cdb (a bit) less painful.
Change-Id: Ib6f4d11a2e6cfc561cc2c5c5598d0751a76208cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Necessary for keeping compatibility within a minor series.
When bumping versions, the compatVersion now needs to be taken into
account too.
Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I25a7c780df5d6ddec5984be0e753d68c0bb79b63
Reviewed-by: David Schulz <david.schulz@digia.com>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
|
| |
| |
| |
| |
| |
| | |
Change-Id: Id54a06a6636588a029de2e2f72d50edcf7ceaaa3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |
| |
| |
| | |
Change-Id: Ibf982c6aac6b0d097d4ec764399197af7a2fe03a
|
| |
| |
| |
| |
| | |
Change-Id: I69393d9b2aca0e4a702af8385020547bf89ba6fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|/
|
|
|
| |
Change-Id: I3719f99180012d82af603134360fdd9eedab24f9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
|
|
|
|
| |
Change-Id: I740c2db6660713aa8db192464c96ce91d827b0e5
|
|
|
|
|
|
|
|
|
|
|
|
| |
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.
Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
numerous "3rdparty" libraries have respective #ifdefs, and consequently
the define is added in several places. it's quite a mess with the .pr?
and .qbs files, though. solve the problem by sidestepping it.
Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: Ie871ea099caa08b2757303e81733acc5ed6294de
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|\ |
|
| |
| |
| |
| |
| | |
Change-Id: I2d49644b63bad9b7ffa7d088f443ed6ec2fc85ed
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
|
|/
|
|
|
| |
Change-Id: If7972209cb9346217af43f9c1faa667bf644a54a
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
| |
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qtsupport/baseqtversion.cpp
tests/auto/cplusplus/findusages/tst_findusages.cpp
Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
|