summaryrefslogtreecommitdiff
path: root/qtcreator.pri
Commit message (Collapse)AuthorAgeFilesLines
* Version bumpKai Koehne2013-02-071-1/+1
| | | | | Change-Id: I86e238f87756e66fec1b8f3355ce289c55aa4f22 Reviewed-by: hjk <hjk121@nokiamail.com>
* Project: Only add qbs file if it existsOrgad Shaneh2013-02-041-1/+2
| | | | | Change-Id: I2d49644b63bad9b7ffa7d088f443ed6ec2fc85ed Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Generalize QT_NO_CAST_FROM_ASCIIOrgad Shaneh2013-01-161-2/+1
| | | | | Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0 Reviewed-by: hjk <qthjk@ovi.com>
* Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-11-261-3/+6
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Fix building against Qt5 on MacOS.Erik Verbruggen2012-11-261-3/+6
| | | | | | | | | | | | | | | | | | | | | | Qt5 will set the mmacosx-version-min to either 10.6 or 10.7, depending on the mkspec used. These lines resulted in two mmacosx-version-min flags, when libc++ is used (macx-clang-libc++ mkspec), this leads to compiler errors. As Qt/qmake already adds the flag, there should not be a need to set it in the .pri/.pro files. Change-Id: Ib8cc59d2b064737aa0b5a889b2b3183eceaea1f3 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Version bump.Eike Ziller2012-11-151-1/+1
| | | | | | | | Change-Id: Ifea253aaa719d020926a17498dc23b76134e0534
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-11-091-4/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/fakevim/fakevimhandler.cpp src/plugins/qtsupport/baseqtversion.cpp tests/auto/cplusplus/cxx11/cxx11.pro tests/auto/cplusplus/cxx11/tst_cxx11.cpp tests/auto/icheckbuild/icheckbuild.pro Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
| * Qt5: Correct usage of testlib.Nikolai Kosjar2012-11-051-4/+0
| | | | | | | | | | | | | | | | This corrects commit 112f80. $$QTESTLIB is not needed since both Qt4 and Qt5 support "QT += testlib". Change-Id: I776b44825295c86d2d85e9b8dc6a422da6f36ab6 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| * Version bump.Eike Ziller2012-11-051-1/+1
| | | | | | | | Change-Id: I978a6d435c53276a0f7a024e534278aa5f794ebb
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-251-0/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: share/share.qbs tests/auto/icheckbuild/icheckbuild.pro Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
| * Qt5: Fix warning "qtestlib is deprecated".Nikolai Kosjar2012-10-241-0/+4
| | | | | | | | | | | | | | | | "Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib instead." Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| * Version bumpEike Ziller2012-10-181-1/+1
| | | | | | | | Change-Id: Id0b100ae13cdd5edd82614c10bdf0cdeb45e6615
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-161-0/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
| * Include qbs files in qmake project treeOrgad Shaneh2012-10-161-0/+2
| | | | | | | | | | | | Change-Id: I864b1b500d385c91e3cac6725202ad7f48f11b17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Version bumpEike Ziller2012-10-111-1/+1
| | | | | | | | Change-Id: I6d9fe17cdddda9916ca5fd4da467c83cd14d4b75
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-091-4/+0
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/fileutils.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/genericdirectuploadservice.cpp src/tools/qtcreatorcrashhandler/main.cpp Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
| * Remove default for QTC_PREFIX for Linux.Eike Ziller2012-10-091-4/+0
| | | | | | | | | | | | | | | | It was doing more harm than it helped. Change-Id: I670c4669f18ec0ed833bea6f7d5e9834c130210c Reviewed-by: Daniel Molkentin <daniel@molkentin.de> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-09-261-0/+4
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qtcreator.qbp src/plugins/qtsupport/baseqtversion.cpp src/tools/tools.pro Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
| * Introduce $$QTC_PREFIXDaniel Molkentin2012-09-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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>
* | Merge remote-tracking branch 'gerrit/2.6'Oswald Buddenhagen2012-09-121-1/+26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/environment.cpp src/plugins/android/androidtoolchain.cpp src/plugins/projectexplorer/gcctoolchain.cpp src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp src/shared/proparser/qmakeevaluator.cpp Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
| * use new qmake functions under qt5Oswald Buddenhagen2012-09-111-0/+25
| | | | | | | | | | | | | | waaaay faster than the hand-crafted ones Change-Id: Ia4f60207b26a01752ca1eeddf1d8a76381cd1710 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
| * use the right reference variable for source pathOswald Buddenhagen2012-09-111-1/+1
| | | | | | | | | | | | | | | | $$PWD is not really defined at this point. in qt4 it was the last value assigned to it, while in qt5 it is just missing. Change-Id: I4e70d234a7d5cee88e2d081b053e1ffa1070f788 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
| * Version bump.Eike Ziller2012-09-111-1/+1
| | | | | | | | | | Change-Id: I9e4f32135a36ab15888e2461c3ec599ea11c6dfd Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * Version bump.Eike Ziller2012-09-101-1/+1
| | | | | | | | Change-Id: If3c1355c49d0447a012c034cc4ff05a80a604767
| * Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."Eike Ziller2012-09-071-5/+0
| | | | | | | | | | | | | | | | | | | | 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>
| * Revert "No QTC_PREFIX default on Windows. Causes too many funny side effects."Eike Ziller2012-09-071-0/+1
| | | | | | | | | | | | | | | | | | | | Because the change depends on reverted commit c29bf6f6525d435d69936576761b4a29102cd056 This reverts commit 550f8218deb6736f40dbd1196fcebd0c9ff486e1. Change-Id: If287c4b126b1ef710c074fd85946da41161c6ba9 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * No QTC_PREFIX default on Windows. Causes too many funny side effects.Daniel Molkentin2012-09-061-1/+0
| | | | | | | | | | Change-Id: Ic6448d7ef95f4ff95df8fddd1b78f4071fa5118f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).Daniel Molkentin2012-09-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Version bump.Robert Loehning2012-08-271-1/+1
|/ | | | | Change-Id: Id09e96eb96903c9a758848dbbea79259a624ef12 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Version bump.Robert Loehning2012-08-241-1/+1
| | | | | Change-Id: Ibbd3568439e4ea3296afda92ad6b4507f622f9bd Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Version bump.Eike Ziller2012-07-251-1/+1
| | | | | Change-Id: I889b2f6a572bfc6083cd2129b51a18f5250699fd Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Request Qt pre-5.0 API for Qt 5 buildsThiago Macieira2012-06-071-0/+1
| | | | | | | | | | | | Qt Creator currently must compile with both Qt 4 and Qt 5, so we can't change the code to call the non-deprecated functions that have been recently deprecated in Qt 5, unless those functions already existed. This change asks Qt 5 to enable the use of pre-5.0 API without warnings. Change-Id: Ic165336f40d15fe5793d30bb9262986f738c984e Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Compile with Qt 5.Friedemann Kleint2012-03-131-1/+0
| | | | | | | | Add either QtDeclarative (Qt 4) or QtQuick1 (Qt 5) to QT. Mixing them leads to problems with include paths and linking. Change-Id: I188240641216ee227931a7be2105bc4838385c79 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* version bumpEike Ziller2012-02-291-1/+1
| | | | | Change-Id: I3dd7939a388f67a5addb4313032f182e9672caf1 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Don't build universal binary on PPC host by default.Konstantin Tokarev2012-02-131-1/+0
| | | | | | | | This hack was needed because of QTBUG-6150 which was fixed in Qt 4.7.4. Since Qt Creator already requires Qt 4.7.4 it not useful anymore. Change-Id: If1f195b1dfc750d195dbb83c59794104935016be Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Move QtConcurrent library into Utils.Friedemann Kleint2012-02-091-0/+1
| | | | | | | | It causes a conflict with the new QtConcurrent library of Qt 5 and is quite small. Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Compile with Qt 5.Friedemann Kleint2012-02-081-1/+1
| | | | | | | | | | | | - QtQuick1 renaming. - Start on qtconcurrent split (pending renaming of Qt Creator's qtconcurrent library). - QWinEventNotifier is a public class in Qt 5. - Metatype system: Classes need to be known. Change-Id: I5582e7cc2777bf791a08b049262217055769c80f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add Qt 5 libraries to .pro files.Friedemann Kleint2011-11-241-0/+5
| | | | | | | | Make Qt Creator compile with Qt 5 after using fixqt4headers.pl. Change-Id: I74ca51d562f49378b40103b79848f5dd3b11e77e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* qtcreator.pri: Fix version check to recognize Qt 5.Friedemann Kleint2011-11-221-0/+3
| | | | | Change-Id: Ia98345a1ee5be3cc804679772bbcbaf3431468eb Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-10-281-8/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/qmljs/qmljscheck.cpp src/plugins/debugger/gdb/gdbengine.cpp src/plugins/debugger/gdb/remotegdbserveradapter.cpp src/plugins/plugins.pro src/plugins/projectexplorer/buildmanager.cpp src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
| * Version bump.Eike Ziller2011-10-201-1/+1
| | | | | | | | Change-Id: Ia3d10553312520293ad935812792f9b2a1fd3b7a
| * compile with Visual Studio IDE, take 2Oswald Buddenhagen2011-10-181-2/+6
| | | | | | | | | | | | Change-Id: I30147eeb58e44ef137fb25763f6be6b4d247d6c7 Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * de-obfuscate codeOswald Buddenhagen2011-10-181-6/+2
| | | | | | | | | | | | | | | | remove pointless condition and join identical branches. Change-Id: Iefe86e580d485cba1a71e2a379781b342d8c75d8 Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-10-171-5/+2
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/qmlprofiler/qmlprofilertool.cpp Change-Id: Ie1ecdbaefb9cabebd90bc7c0f8837cc31dbac5af
| * Revert "Compile with Visual Studio IDE: string macros don't need to be escaped"Robert Loehning2011-10-171-5/+2
| | | | | | | | | | | | | | | | | | This reverts commit fe80df7e2ffb9ca334723d13af749c7b3dc973a8. With the above commit, Creator could not be compiled with MSVC 2008. Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-10-171-2/+5
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/qmljs/qmljstypedescriptionreader.cpp tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
| * Compile with Visual Studio IDE: string macros don't need to be escapedPeter Kuemmel2011-10-171-2/+5
| | | | | | | | | | | | | | Merge-request: 400 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I81f335b44fe736f3ffc9ba3212de25edf8589dd1
| * Version bumpEike Ziller2011-10-171-1/+1
| | | | | | | | Change-Id: I5a5079377d043c30c7aabefb2c11a4437ae6c92c
* | Version bump.Eike Ziller2011-10-051-1/+1
|/ | | | Change-Id: Ibcc35096447619f39a8c8fc69d11db00184be726
* Merge app_version.h and ide_version.hEike Ziller2011-08-311-0/+1
| | | | | | | 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>
View Lorry Controller Status