summaryrefslogtreecommitdiff
path: root/src/qtcreatorplugin.pri
Commit message (Collapse)AuthorAgeFilesLines
* Use variables for install locationsEike Ziller2015-09-221-1/+1
| | | | | | | | | | Define variables in qtcreator.pri for the various install locations, instead of hardcoding the paths everywhere where they are needed. Change-Id: Ia34de711a7f2be317272ede023e2a8b9cdcc30fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Load only tested plugins when invoked with -testOrgad Shaneh2015-03-241-0/+4
| | | | | | | | | | | | By default, a clean settings path is used for test environment. All the default plugins are loaded, although they're not needed. This change significantly improves loading time for tests. Change-Id: I24254f3e538e3f0e6d233d0989738dc1ce238209 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Project: Exclude project directory from include pathOrgad Shaneh2015-03-161-0/+1
| | | | | | | | | | | | Some environments include the project directory by default, and some don't (e.g. qbs). In order to avoid compilation errors on the environments that don't, unconditionally exclude the project directory. Change-Id: I8552a269735b42efff1839fb18ce863eed711b7a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Project: Deduplicate dependency resolving logicOrgad Shaneh2015-03-041-17/+11
| | | | | Change-Id: I6af80600b060fa6a99704df0709461799858d41e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Project: Remove unused functionOrgad Shaneh2015-03-041-4/+0
| | | | | Change-Id: I6e74577841d4c9c304393a1e2c672ec3e43fd7e4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* use DISTFILES instead of OTHER_FILES in creator's own build systemOswald Buddenhagen2014-09-151-3/+3
| | | | | | | it's the correct variable to use. Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-021-38/+15
| | | | | | | | Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix library and plugin pathsEike Ziller2014-09-021-11/+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>
* Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri filesEike Ziller2014-08-261-23/+10
| | | | | Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7 Reviewed-by: hjk <hjk121@nokiamail.com>
* Nuke plugins PROVIDER settingsOrgad Shaneh2014-05-081-13/+6
| | | | | | | | Place all plugins in lib/qtcreator/plugins Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-02-111-2/+20
|\ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/shared/qbs Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
| * Use QTC_PLUGIN_DIRS also for generating the dependencies filesKai Koehne2014-01-241-2/+20
| | | | | | | | | | | | | | | | Use the same logic as in 27563451cb6286 to resolve out-of-source plugin dependencies when generating the .pluginspec files. Change-Id: I3a62527ff381aed0e83a7c37a50da403f0a6cece Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Rename pluginjsonmetadata.xsl -> qtcreatorplugin2json.xslhjk2013-12-201-1/+1
| | | | | | | | | | | | | | | | | | The original name inconveniently starts with 'plugin', creating a conflict for shell tab completion when trying to enter src/plugins/... taking extra keystrokes to resolve. Change-Id: I7fa59d767aa900f73cd643dfab0d5b2131652a2d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Mac: Remove code that was there for 10.4 compatibilityEike Ziller2013-12-101-6/+2
|/ | | | | | Change-Id: Ibb586513f256deb5e0e8aa7c5100055482a031a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* exclude .pluginspec from 'make clean'Oswald Buddenhagen2013-10-091-1/+1
| | | | | | | | | | 'clean' per qmake's definition means "all intermediate artifacts are gone". the target is supposed to be still runnable/installable. Task-number: QTCREATORBUG-10323 Change-Id: Ic0d6482c7534367753661e80ccd5f55bd0446545 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* make plugin _dependencies.pri file optionalOswald Buddenhagen2013-10-021-1/+9
| | | | | | | | | | | | | plugins that cannot be depended upon don't need it. of course, the project file needs to directly define the respective variables instead. this makes it possible to have stand-alone plugins in arbitrarily named directories. Change-Id: I166d997bb4db41feac9ffe897cefce382e533bb0 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Do not generally add a plugin's directory to its include paths.Christian Kandeler2013-10-011-3/+0
| | | | | | | | | It's not necessary, and it lets people get away with using the wrong kind of include statement. Change-Id: I736a0aae93c930da37dbac548a3bb025838e7588 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Streamline mimetypes.xml filesOrgad Shaneh2013-06-071-0/+3
| | | | | Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* fix auto-generated version info in .pluginspec filesOswald Buddenhagen2013-05-281-4/+7
| | | | | | | | | | | we need to include qtcreator.pri before calculating $$dependencyList, as that's where the version comes from. this also has the side effect that the "real" dependency resolution in qtcreator.pri gets "clean" input - not that it would actually matter. Change-Id: Ibb91c569c8e05b0e45214e7e84aee8ff3316bf5d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* auto-generate <dependencyList> in .pluginspec filesOswald Buddenhagen2013-04-111-0/+13
| | | | | | Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* derive TARGET from QTC_{LIB,PLUGIN}_NAMEOswald Buddenhagen2013-04-031-0/+1
| | | | | | | | the information is redundant now Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* make library and plugin dependencies declarativeOswald Buddenhagen2013-04-031-2/+2
| | | | | | | | | | | | 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>
* centralize assignment of TEMPLATE = libOswald Buddenhagen2013-04-021-0/+1
| | | | | Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* automatically include libs' and plugins' _dependencies.pri filesOswald Buddenhagen2013-04-021-0/+2
| | | | | Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Copy plugins to correct user directory under Unix.Marcel Krems2012-11-291-0/+1
| | | | | Change-Id: I587154926a5e4bce62984445d7a00547c0b51673 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Change the default plugin provider to QtProject.Eike Ziller2012-10-091-3/+3
| | | | | Change-Id: I4fbfeb3668d6688e4947cda514c1a56f7d01ca52 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Introduce $$QTC_PREFIXDaniel Molkentin2012-09-251-2/+2
| | | | | | | | | | | | | | | | 'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/... This is used for giving the contents of the 7zips an additional prefix. (previously done by doing an additional copying step in bindistHelper). QTC_PREFIX can also be used to give Qt Creator a different install path at qmake time, and defaults to /usr/local on Linux. On Windows and Mac there is no default for QTC_PREFIX. Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make && INSTALL_ROOT=/tmp/creator-dist make install Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* use new qmake functions under qt5Oswald Buddenhagen2012-09-111-0/+10
| | | | | | | waaaay faster than the hand-crafted ones Change-Id: Ia4f60207b26a01752ca1eeddf1d8a76381cd1710 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."Eike Ziller2012-09-071-2/+2
| | | | | | | | | | It depends on and mixes in changes made in another change on gerrit that is not merged, so it breaks the package build. This reverts commit c29bf6f6525d435d69936576761b4a29102cd056. Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).Daniel Molkentin2012-09-051-2/+2
| | | | | | | | | | | | | | | | | Reason: $INSTALL_ROOT is only meant to be used by packagers to temporarily put the contents into a different location, which is needed for fakeroot packaging. QTC_PREFIX is not a qmake variable, and defaults to /usr/local. On Windows the default prefix is "QtCreator", since "make install" is expected to be used in a packaging context only where either INSTALL_ROOT should be used or QTC_PREFIX should be set to the absolute destination path where e.g. an installer generator will pick it up. Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compilation with Qt 5 / nmake / shadow buildsKai Koehne2012-08-211-0/+2
| | | | | | | | | | | qmake/qt4 included the source directory automatically for most plugins, which got dropped in qt 5 (change 0f548b1744e2). Make sure it's included again ... Change-Id: Ief06cf9b3c7afd8432df7511df5f917023d477ef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Port Qt Creator to the new plugin system of Qt 5.Friedemann Kleint2012-03-021-0/+16
| | | | | | | | | | - Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN for Qt 4. - Generate the Json files for Qt 5 from the pluginspec files by using a XSLT sheet. Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add Nokia plugins in the path for non Nokia provider.Nicolas Arnaud-Cormos2012-02-221-0/+2
| | | | | | | | Nokia plugins (like Core) are needed for any other plugin. Automatically add them, even if the PROVIDER is not Nokia. Change-Id: I2b32d27b34fc1043f5f4a1e1607b24dc01c9c631 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix local data path on Linux.Nicolas Arnaud-Cormos2012-01-041-1/+1
| | | | | Change-Id: I1996e1035448a8f7ff7d29d1c57973c85fd52344 Reviewed-by: hjk <qthjk@ovi.com>
* make use of QMAKE_SUBSTITUTES less bizarreOswald Buddenhagen2011-11-091-1/+1
| | | | | | | | qmake should work well enough for that now. we use the same construct in app.pro, anyway. Change-Id: Iabee60e9b898e92e003850e0a8c88673fa3ced6d Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Commit things that went missing from 2a4a56b2beec7a3c0be94302146461d2f730315dEike Ziller2011-10-061-4/+10
| | | | | | | Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae Reviewed-on: http://codereview.qt-project.org/6120 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Load plugins from user config directory too.Eike Ziller2011-10-051-2/+12
| | | | | | | | | | | Also adapt the Qt Creator plugin template to make it possible to choose between deploying locally or into Qt Creator's build directory. Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2 Rubber-stamped-by: Daniel Molkentin Reviewed-on: http://codereview.qt-project.org/4178 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Make sure plugins on Linux resolve all dependenciesThiago Macieira2011-03-151-0/+1
| | | | | | | Remove the previous code which hardcoded options and didn't work for linux-icc. Reviewed-By: dt
* Implement an external tool container + xml parsing.con2011-02-181-2/+0
|
* dynamically replace creator version during buildOswald Buddenhagen2010-11-031-5/+18
| | | | | ... instead of running a sed script over a lot of files on each version increment.
* centralize addition of pluginspecs to OTHER_FILESOswald Buddenhagen2010-11-031-0/+1
|
* Mac: Use rpath instead of executable_path.con2010-11-011-0/+5
| | | | | | | | Because executable_path and loader_path are just too inflexible for some stuff. The rpath is supposed to be set to the Qt Creator app's Contents folder. Compiling on 10.4 now requires to enter compatibility mode via QTC_TIGER_COMPAT env variable or TIGER_COMPAT_MODE qmake variable.
* Make tests compile on Mac. Use qtLibraryName instead of qtLibraryTarget.con2010-11-011-1/+1
| | | | | | qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes it fail in pri files that are used for app pro files. The tests still don't run because of run time linking issues.
* Add precompiled headers to Qt Creator sources, to any library and pluginDenis Mingulov2010-10-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Precompiled headers are a performance feature supported by some compilers to reduce the (re-)compilation time substantially. Usage in Qt: http://doc.qt.nokia.com/4.7/qmake-precompiledheaders.html Due to the usage of precompiled headers Qt without demos/examples/webkit etc might be compiled even faster than Qt Creator on some systems. Despite of Qt, Qt Creator consist of mostly quite small subprojects (plugins and libraries) where the effect would not be so noticeable but still will be visible. This patch adds default precompiled headers to any plugin and library (i.e. by changes in src/qtcreatorplugin.pri and src/qtcreatorlibrary.pri respectively). Almost the same headers are included to general precompiled header (src/shared/qtcreator_pch.h) like used in QtCore, just QPointer/QScopedPointer etc and QDebug are added, it is used almost in any subproject. Also for plugins some QtGui related headers are added (src/shared/qtcreator_gui_pch.h). Default precompiled headers are enabled so: isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/header.h So it is possible to override this variable in any place in the project file in case if it will be needed. Such overriding is used for Botan (src/libs/3rdparty/botan) - it is not a Qt project, just a pure C++. Most usable headers were used to create special precompiled header for Botan. It is 3rd party component so also src/libs/3rdparty/precompiled_headers folder was created - to use for any future 3rd party components' precompiled headers. To enable a usage of precompiled headers feature in Qt projects 'precompile_header' has to be added to CONFIG. It is done by default for limited platforms only (e.g. not for Linux now), so to enable it on any other platform - e.g. special qmake command has to be used: qmake "CONFIG *= precompile_header" -r ../../qt-creator/ To disable a usage of precompiled headers (on platforms where it is pre-enabled - otherwise it will be used automatically): qmake "CONFIG -= precompile_header" -r ../../qt-creator/ To see on which platforms precompiled headers feature is enabled by default - qt/mkspecs folder has to be checked. Precompiled headers require an additional space on the disk, it looks like for Qt Creator full size of the shadow build folder grows up to 2 times (e.g. 1.5 GB to 3 GB). Test results: Linux x64, gcc 4.4, T7500, 3 GB RAM: About 22.5 minutes are reduced to about 14 minutes (almost 80% faster). Windows x86, vs2008, P8400, 2 GB RAM: About 70 minutes are reduced to about 20 minutes (amazing 250% faster). Merge-request: 2182 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix pluginspec on windowsdt2010-09-081-1/+3
| | | | | Reported on IRC Reviewed-By: hjk
* Build system: make 'install' target work on Windows.Daniel Molkentin2009-09-251-1/+1
| | | | Reviewed-By: Oswald Buddenhagen
* It's "Qt Creator" and that should reflect in the App name on Mac.con2009-09-151-1/+1
|
* clean up OS conditionals in project filesOswald Buddenhagen2009-06-031-1/+1
|
* Rename qworkbenchplugin.pri to qtcreatorplugin.priAlessandro Portale2009-05-081-0/+50
View Lorry Controller Status