aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/app.pro
Commit message (Collapse)AuthorAgeFilesLines
* Make executable name configurableEike Ziller2018-01-161-0/+1
| | | | | Change-Id: I6b5420ab2275c37e51f665005e31b80b6dfae8cb Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* macOS: Fix that Info.plist was overwritten in in-source buildsEike Ziller2018-01-151-1/+1
| | | | | | | | | | $$PWD and $$OUT_PWD are the same for in-source builds, so rename the source Info.plist to avoid overwriting it with the same name (which could easily lead to an accidental git submit of the generated file). Change-Id: Idc593d8e00dc52f11309eae3b913799fb9b8afdf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/4.4'Orgad Shaneh2017-08-301-0/+1
|\ | | | | | | Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
| * Fix copyright year in plugin info, --version, and macOS infoEike Ziller2017-08-241-0/+1
| | | | | | | | | | | | | | | | By using the new QTCREATOR_COPYRIGHT_YEAR variable Task-number: QTCREATORBUG-18612 Change-Id: I3bcf0319660d210436d3130c00f43325c460a66c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-07-281-2/+4
|\| | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/qbsprojectmanager/qbsproject.h Change-Id: I6b9cdf704be95ade02488c8b19582b6621282fb8
| * Fix compilation breakage with mingw / windresKai Koehne2017-07-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | The replacement of string defines in the .rc file that was introduced in commit b5703bcd029fd does not work with windres. Here the string literals have to be explicitly quoted by STRINGIFY. Also, we need to replace literal spaces with \x20. Task-number: QTCREATORBUG-18635 Change-Id: Ie01886ea680c3c07c4e0a031f12b6fe60e896263 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Introduce Breakpad crash handlerMarco Bubke2017-07-251-4/+1
|/ | | | | | | | | | | | Google Breakpad (https://chromium.googlesource.com/breakpad/breakpad) is a widely used crash handler framework, e.g. by Mozilla and Chromium. It is providing a platform neutral solution to generate mini dumps, collect debug information and generate stack traces from those. Done-with: Orgad Shaneh <orgad.shaneh@audiocodes.com> Change-Id: I09382e7db0dc9e29b228e7b554fda7b6f5684349 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Add name, version as metadata to Windows executableKai Koehne2017-07-251-0/+6
| | | | | | | | | | The description and version is seen e.g. in the file dialogs, but also in the task manager and crash dialogs. Change-Id: I65f7076a55ecbdcaa6b7c9ab57fecaab59bcaa08 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix the deployment target problem once and for allJake Petroules2017-07-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of hardcoding the value of LSMinimumSystemVersion in Info.plist where we will always forget to update it (and since Qt Creator can be built with multiple versions of Qt, it will almost certainly be wrong for one of those versions), automatically determine the value from QMAKE_MACOSX_DEPLOYMENT_TARGET, which is authoritative. This should prevent mishaps where users try to run Qt Creator on older OS versions and receive a crash dialog instead of the friendly "This app requires a newer version of macOS" message that a properly set LSMinimumSystemVersion value will induce. The Qbs build is not affected by this problem, as Qbs automatically handles the minimum deployment target even when a custom Info.plist is specified. The solution chosen in this patch was used instead of QMAKE_SUBSTITUTES because the Qbs build also uses the Info.plist input file and it would break the Qbs build if the quotes were to be escaped, since it would become invalid XML. Change-Id: I20625a2fae546c6597a567f28864b12917e8ac39 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix deployment target on macOSJake Petroules2017-06-121-1/+1
| | | | | | | | According to the README, the minimum version is 10.8, but the code did not reflect that reality. Change-Id: I2bbaeefe614cba5b5fa8413b68202bb75f346d70 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Let qmake handle asset catalog compilation on macOSJake Petroules2016-11-211-21/+28
| | | | | Change-Id: I9451a0cd7b15bb6c84147298a4f1fde5d67ddf4d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Support make install also on OS XEike Ziller2016-04-221-6/+11
| | | | | | | | It can be helpful, is not much effort, and parts did not restrict the install target to non-OS X already. Change-Id: I3501f37f089e981cf3f72d9250c9b9161d1565d6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix missing application icon in Qt Creator qmake build.Jake Petroules2015-11-201-3/+3
| | | | | | | Task-number: QTCREATORBUG-15260 Change-Id: I60bb8c455e708d377828801377c4fee43e654dcb Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Use IDE_DATA_PATHEike Ziller2015-10-291-2/+2
| | | | | | | We have a variable for it, so use it Change-Id: I0985c7540fc0589abe9532ad1f2a590134fa5195 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* Qbs: properly install Info.plist, PkgInfo, and app icon.Jake Petroules2015-10-211-8/+19
| | | | | | | | | The icns files have also been moved into an asset catalog because "source code" as a rule should be stored in the preferred form of modification. Change-Id: I883db5704a46d8d7cf601f7fb4471619ebbc34bf Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Use variables for install locationsEike Ziller2015-09-221-2/+2
| | | | | | | | | | 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>
* Do not build main application with testlibOrgad Shaneh2015-06-081-0/+1
| | | | | | | | | Passing TEST=1 to qmake makes the application run in console. There are no tests in main.cpp anyway. Change-Id: Ia5d1e02feb38e635f48169cc47d45738e4556f79 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.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>
* Mark app.pro as QTC_RUNNABLEDaniel Teske2014-07-081-0/+1
| | | | | Change-Id: I8549e00a6360504fad2a93e3b862ecc8cd909c2a Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Core: Adding Utils to Libs for the app subproject.David Schulz2013-10-091-1/+1
| | | | | | | Needed because of I696133c42a142a8c596703fc8ce0250b58993d99 Change-Id: I947a76399cff30a0031064258f302cc8ec1ae50f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-09-261-2/+2
|\ | | | | | | | | | | | | | | | | Conflicts: qtcreator.qbp src/plugins/qtsupport/baseqtversion.cpp src/tools/tools.pro Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
| * 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>
| * 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>
* | Compile fix for nmakeRobert Loehning2012-09-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-7922 Needed to work around Task-number: QTBUG-13496 Done-with: Joerg Bornemann <joerg.bornemann@digia.com> Change-Id: I7d5f7cc4cd45909ed4e3b5a16fd235820bc3ef8c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Get rid of ifdefs for crash handler in main.cpp.Nikolai Kosjar2012-09-241-8/+2
| | | | | | | | | | | | | | | | Adapt the *.pro and *.qbp files to build unconditionally since the ifdefs are already inlined in the functions. Change-Id: I492f39600222a6174d4e16546bfa5a289965e8cb Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Linux: Add a crash handler providing a backtrace for debug builds.Nikolai Kosjar2012-09-211-0/+7
|/ | | | | | | | | | | | | | | | | | | | | | | | Use case: You're working with a debug version of Qt Creator and you're interested in getting a backtrace displayed as soon as Qt Creator crashes without searching for the core file, starting your debugger, ... Once a 'serious signal' (currently SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGPIPE) is delivered, a popup displays the following debug information: - Qt Creator version (same as in the about dialog) - Kernel version (uname -a) - GNU/Linux Distribution (/etc/lsb-release) - Backtrace (by gdb) Please note that this crash handler is built and used only in debug mode on GNU/Linux. It's solely meant as a convenience tool for the developer. In contrast to the breakpad integration, this crash handler operates 'offline'. There is no network i/o involved. Change-Id: Idcfb1bf1ad68942615ecfe0dffc0d03154455049 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Merge app_version.h and ide_version.hEike Ziller2011-08-311-1/+5
| | | | | | | Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c Reviewed-on: http://codereview.qt.nokia.com/3918 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Fix generation of Info.plist on Mac.con2010-11-121-3/+3
| | | | | | | Since the move to Info.plist.in, Mac builds were missing their Info.plist, because the combination of QMAKE_INFO_PLIST and QMAKE_SUBSTITUTES doesn't play well. Moving to use QMAKE_SUBSTITUTES exclusively.
* dynamically replace creator version during buildOswald Buddenhagen2010-11-031-1/+3
| | | | | ... instead of running a sed script over a lot of files on each version increment.
* Make app.pro use the qtLibraryName functioncon2010-10-131-7/+2
|
* Add breakpadMarco Bubke2010-09-091-0/+4
| | | | This is not activated if breakpad and qt-breakpad is not availiable.
* Mac: Open generic and qml projects from Finder with Qt Creator.con2010-01-141-1/+1
|
* Build system: make 'install' target work on Windows.Daniel Molkentin2009-09-251-0/+2
| | | | Reviewed-By: Oswald Buddenhagen
* Use systems preferred language on Mac.con2009-09-111-1/+1
| | | | | And ensure that the menu items don't vanish from the application menu when they are translated.
* Add some "other file".con2009-09-021-0/+2
|
* Add some icons for .pro and .pri files on Mac OS X.Norwegian Rock Cat2009-07-151-0/+3
| | | We now at least follow what other Mac applications do.
* clean up OS conditionals in project filesOswald Buddenhagen2009-06-031-15/+8
|
* use IDE_APP_PATH more, introduce IDE_LIBEXEC_PATHOswald Buddenhagen2009-05-061-1/+1
| | | | IDE_LIBEXEC_PATH is still the bindir, so it's kinda fake. oh, well.
* automate setting IDE_BUILD_TREEOswald Buddenhagen2009-05-061-2/+0
|
* revamp build systemOswald Buddenhagen2009-04-201-22/+4
| | | | | | | | | now bin and share are not pegged to linking the executable any more, but are proper subdirs targets of their own. unforturnately, qmake is a bit tenacious, so we hack around a bit. :) more or less in passing by, i removed some superfluous trailing slashes and added path normalization as well.
* Fixes make install not installing the wrapperdt2009-04-161-3/+5
| | | | Patch by Fathi Boudra.
* app.pro: also add $$IDE_APP_TARGET to the installationhjk2009-04-081-0/+1
|
* install the wrapper script into both the builddir and the installdirOswald Buddenhagen2009-03-271-17/+29
|
* Fixes: Compilation on other non unix systemsdt2009-03-111-1/+1
| | | | | Task: Reported on ML RevBy: con
* Fixes: Don't explicitly link against svg and dbuscon2009-03-101-2/+0
| | | | | Details: Since we now set LD_LIBRARY_PATH. Missing part is that we need to ship Qt3Support with creator.
* Fixes: - Resources (templates etc) on Maccon2009-01-271-0/+2
|
* Fixes: move all files in shared/* to src/shared/*hjk2009-01-261-1/+1
|
* Fixes: make install works on linuxDaniel Molkentin2009-01-211-51/+4
| | | | | | Details: Creator on Linux works now in two modes: 1) out of the build dir (shadow builds to be tested) 2) make INSTALL_ROOT=/prefix install
* Fixes: make install workdDaniel Molkentin2009-01-211-4/+0
| | | | | | | | Details: Make install works now, we just have to agree on layout details and check for mac compatibility. Also, plugins will carry no version in their filename anymore starting with this commit. Versioning happens in the creators pluginloader using the pluginspec file.