summaryrefslogtreecommitdiff
path: root/qtcreator.pri
Commit message (Collapse)AuthorAgeFilesLines
* Version bumpEike Ziller2014-12-011-2/+2
| | | | | Change-Id: Ieacb686c9c241159054543e2501d0354a63c1853 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Version bumpEike Ziller2014-10-281-2/+2
| | | | | Change-Id: If2233d241e83f82400e4e910e405eabebf887d58 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* New branch for binary artifactsEike Ziller2014-10-161-1/+1
| | | | | Change-Id: I77f0a248c934e19f89c590577269d2fea537ae00 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use DISTFILES instead of OTHER_FILES in creator's own build systemOswald Buddenhagen2014-09-151-1/+1
| | | | | | | it's the correct variable to use. Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Remove Qt version checks.Christian Kandeler2014-09-081-9/+1
| | | | | | | | Qt 5.3 is the minimum requirement these days. Remove all fallback code from sources and project files. Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix library and plugin pathsEike Ziller2014-09-021-2/+2
| | | | | | | | | OSX: Move libraries from PlugIns/ to Frameworks/ other: move QmlDesigner plugins to plugins directory Change-Id: Ia266a3514ce6a496061daa044b3781daae0bc272 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Do not use deprecated Qt functionality.Christian Kandeler2014-08-291-1/+0
| | | | | | | | | | | | | | | Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri filesEike Ziller2014-08-261-64/+2
| | | | | Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7 Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix version number.Eike Ziller2014-07-221-3/+3
| | | | | Change-Id: I657277feb77f33b345f58729cdc1c05b1fdb5528 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Update binary-artifacts branch settingEike Ziller2014-07-151-1/+1
| | | | | | Change-Id: I779a7c3a12d03f0d1920c89b38b019b81502712b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Version bumpEike Ziller2014-07-081-2/+2
| | | | | Change-Id: Iceded20db5c4d18b3ae075f99faacb351967277c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Version bumpv3.2.0-beta1Eike Ziller2014-07-071-2/+2
| | | | | Change-Id: Id327afba79a865cf64b64fd817efe5c8b8797043 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Support qmake variable as well as environment variable for QTC_PLUGIN_DIRSEike Ziller2014-06-301-2/+2
| | | | | | | 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>
* Centralize addition of plugin library pathsOrgad Shaneh2014-05-081-0/+1
| | | | | Change-Id: I9ddcc193b4d927c3d566eeb81c41f79a75920696 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Clean some trailing whitespaceOrgad Shaneh2014-05-071-1/+1
| | | | | Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-271-0/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
| * Allow list of plugin directories to be passed in QTC_PLUGIN_DIRShjk2014-03-241-0/+1
| | | | | | | | | | Change-Id: Ied926ed78f24d06ff0ff693d768e12ecb505ccbf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Version bumpEike Ziller2014-03-031-2/+2
| | | | | | | | Change-Id: Ibb0d0d64f379684b1ae8f7cd55a8a5436056432b
| * Update binary artifacts branchEike Ziller2014-02-251-1/+1
| | | | | | | | | | Change-Id: Iea998510555e3762e6a8457bb6e998c3533c2dee Reviewed-by: David Schulz <david.schulz@digia.com>
* | Mac/Qt4: Allow compilation with macx-clang mkspec tooEike Ziller2014-03-071-1/+5
| | | | | | | | | | Change-Id: I91752859f790b5576db7ec8678c58924f643187c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Make C++11 unconditionalEike Ziller2014-03-051-8/+18
| | | | | | | | | | | | Change-Id: I88d6f99a1fa714386337589e1edda66b66091151 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Version bumpEike Ziller2014-02-251-2/+2
|/ | | | Change-Id: I005fb91b5e3cd5956edb108d0ec730db64cc98e9
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-02-111-0/+1
|\ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/shared/qbs Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
| * Version bumpv3.0.1Eike Ziller2014-01-291-1/+1
| | | | | | | | | | Change-Id: Ie852069d4c3f01eb021837644865fdea41a34c54 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Pick up QTC_PLUGIN_DIRS from environmentKai Koehne2014-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | Enable C++11 on all platforms except Mac/releaseKai Koehne2014-02-061-0/+3
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-12-181-1/+1
|\ \ | |/
| * Fix build with Qt4Eike Ziller2013-12-181-1/+1
| | | | | | | | | | Change-Id: I1ef1f20d776f955c2f08d551dbac1621b98c0961 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-12-181-3/+16
|\ \ | |/ | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/stdtypes.py src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
| * Allow plugins to depend on plugins outside of creator source treeKai Koehne2013-12-171-3/+16
| | | | | | | | | | | | | | | | | | 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>
| * Version bumpEike Ziller2013-12-031-2/+2
| | | | | | | | Change-Id: I9bf6bbeefcfce9759f8b10e0d5dfb9864315beb4
| * Bump versionEike Ziller2013-11-251-2/+2
| | | | | | | | Change-Id: I124bfc5ed26f2d64028c72e89539c16d5d3836be
| * Version bumpEike Ziller2013-11-061-2/+2
| | | | | | | | | | Change-Id: Id68423b08a6f7e0d295e7b065d7c50d25f914541 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * CdbExt: Checkout branch 3.0 of binary-artifacts repository.David Schulz2013-10-231-1/+1
| | | | | | | | | | Change-Id: Ice27f5cc433f436cdb0445b14ba2902c601d5295 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Version bumpEike Ziller2013-10-161-2/+2
| | | | | | | | | | Change-Id: I0ea3a31a430cae57e72fc1be6e9305d56597d503 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Mac: Remove code that was there for 10.4 compatibilityEike Ziller2013-12-101-6/+4
| | | | | | | | | | | | Change-Id: Ibb586513f256deb5e0e8aa7c5100055482a031a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Version bumpEike Ziller2013-10-041-2/+2
|/ | | | Change-Id: I6d0e52f57fe0e2c762ba12a9ed86de2458463772
* MSVC: Prevent incremental linking on debug buildsOrgad Shaneh2013-09-261-0/+2
| | | | | | | Makes startup times with cdb (a bit) less painful. Change-Id: Ib6f4d11a2e6cfc561cc2c5c5598d0751a76208cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add QTCREATOR_COMPAT_VERSIONEike Ziller2013-07-091-0/+1
| | | | | | | | | | | 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>
* use master branch of binary artifactsEike Ziller2013-06-281-1/+1
| | | | | Change-Id: I25a7c780df5d6ddec5984be0e753d68c0bb79b63 Reviewed-by: David Schulz <david.schulz@digia.com>
* Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-06-271-0/+1
|\ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
| * Checkout correct branch of the binary-artifacts repository.David Schulz2013-06-261-0/+1
| | | | | | | | | | | | Change-Id: Id54a06a6636588a029de2e2f72d50edcf7ceaaa3 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Version bumpEike Ziller2013-06-261-1/+1
| | | | | | | | Change-Id: Ibf982c6aac6b0d097d4ec764399197af7a2fe03a
| * Version bump.Eike Ziller2013-05-311-1/+1
| | | | | | | | | | Change-Id: I69393d9b2aca0e4a702af8385020547bf89ba6fe Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Version bumpEike Ziller2013-05-301-1/+1
|/ | | | | Change-Id: I3719f99180012d82af603134360fdd9eedab24f9 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Version bumpv2.8.0-betatqtc/v2.8.0-betaEike Ziller2013-05-291-1/+1
| | | | Change-Id: I740c2db6660713aa8db192464c96ce91d827b0e5
* make library and plugin dependencies declarativeOswald Buddenhagen2013-04-031-0/+28
| | | | | | | | | | | | 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>
* define QT_CREATOR centrallyOswald Buddenhagen2013-04-021-1/+1
| | | | | | | | | | 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>
* Enable WITH_TESTS when BUILD_TESTS is specifiedOrgad Shaneh2013-03-271-0/+2
| | | | | Change-Id: Ie871ea099caa08b2757303e81733acc5ed6294de Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge branch '2.7'Oswald Buddenhagen2013-02-071-1/+2
|\
View Lorry Controller Status