summaryrefslogtreecommitdiff
path: root/qtcreator.pri
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Version bump.con2011-06-291-1/+1
| | | | Change-Id: I6c284e1b18388a2f9e1bad2ef0802b75d5124975
* Merge remote-tracking branch 'origin/2.2'Oswald Buddenhagen2011-03-151-6/+0
|\
| * Make sure plugins on Linux resolve all dependenciesThiago Macieira2011-03-151-6/+0
| | | | | | | | | | | | | | Remove the previous code which hardcoded options and didn't work for linux-icc. Reviewed-By: dt
* | Merge remote branch 'origin/2.2'con2011-03-111-4/+1
|\ \ | |/
| * Symbian: Remove S60devicesTobias Hunger2011-03-101-4/+0
| | | | | | | | | | | | | | | | Remove S60devices and all the code surrounding it. This gets rid of the S60 devices tab in the options dialog, too. Tasknumber: QTCREATORBUG-3681 Reviewed-by: dt
| * clean up DEPENDPATH insanityOswald Buddenhagen2011-03-091-4/+1
| | | | | | | | | | | | | | | | simply add CONFIG += depend_includepath to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them were missing anyway, and i wouldn't expect it to ever change. not touching src/shared/ for syncing reasons.
* | Symbian: Remove S60devicesTobias Hunger2011-03-091-4/+0
| | | | | | | | | | | | | | Remove S60devices and all the code surrounding it. This gets rid of the S60 devices tab in the options dialog, too. Tasknumber: QTCREATORBUG-3681
* | Version bump.con2011-03-071-1/+1
|/
* Implement an external tool container + xml parsing.con2011-02-181-2/+4
|
* Creator: Also warn off undefined symbols on linux-g++dt2011-01-211-1/+1
| | | | Patch by Fabo
* Mac: Explicitly do a 10.5+ build if not doing a tiger compatible build.con2010-11-181-0/+4
| | | | | Qt for some reason doesn't tell the tool chain to require 10.5 when doing a cocoa build but on x86.
* dynamically replace creator version during buildOswald Buddenhagen2010-11-031-0/+2
| | | | | ... instead of running a sed script over a lot of files on each version increment.
* Mac: Use rpath instead of executable_path.con2010-11-011-0/+1
| | | | | | | | 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.
* QmlDesigner: Improve Qt version check in plugins.proKai Koehne2010-09-291-0/+20
| | | | Reviewed-by: Thomas Hartmann
* add include guard for qtcreator.priOswald Buddenhagen2010-09-101-0/+3
| | | | this also covers the higher-level includes for libs and plugins
* QML Observer: reverted hack, fixed compilation for ibmakeLasse Holmstedt2010-08-051-0/+13
| | | | see 576642a76a6ed6010de633bfcef7f29f9c3f259c for details
* Merge remote branch 'origin/2.0'con2010-06-241-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/qtcreator.qdoc src/plugins/help/helpplugin.cpp src/plugins/projectexplorer/projectexplorer.cpp src/plugins/projectexplorer/projectexplorer.h src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp src/tools/qml/qmldump/main.cpp
| * Remove LD_LIBRARY_PATH script.dt2010-06-221-2/+1
| | | | | | | | | | | | | | | | Christian Kamm convinced me that it should not have any effect. Reviewed-By: ckamm Task-Nr: QTCREATORBUG-1646
| * Revert disabling of qml support (2.0.0 branch)Kai Koehne2010-06-071-6/+0
| | | | | | | | This reverts commit 5234c775f765a and 210652912b728e9c.
| * Make the QmlJSEditor work when Qml support is disabled.Christian Kamm2010-06-031-0/+6
| | | | | | | | | | | | | | | | - Enable qmlprojectplugin even if Qml support is disabled. - But disable its wizards in that case. - Disable the Qml file wizard if the support is off. Reviewed-by: Kai Koehne
* | QmlJS: Fix target directory for qmldump executable on Mac.con2010-06-101-0/+2
|/ | | | Reviewed-by: ckamm
* Turn Symbian support on for Linux by default.con2010-04-071-2/+2
| | | | Requested-by: Friedemann Kleint
* Fix compiler warnings with MVSC2008Kai Koehne2010-03-171-0/+5
|
* QT_USE_FAST_OPERATOR_PLUS still breaks *some* macs ...Oswald Buddenhagen2010-02-111-1/+1
| | | | ... so just disable it for all macs.
* re-enable QT_USE_FAST_CONCATENATIONOswald Buddenhagen2010-02-081-1/+1
| | | | includes workaround for breakage with old g++
* Reapply unconnected changes from reverted commitKai Koehne2010-02-081-3/+2
| | | | Only revert stuff that is linked to fast string concat.
* Revert "compile everything with QT_USE_FAST_CONCATENATION"Kai Koehne2010-02-081-1/+2
| | | | | | | | | | | | | | This reverts commit e70530c5ad85c1c44fca99be04d5e37043d3baca. It did break builds on older gcc versions (gcc 4.1.2 64 bit Linux, gcc 4.0.1 on Mac OS X): parser/qmljsgrammar_p.h: In static member function ???static int QmlJSGrammar::nt_action(int, int)???: parser/qmljsgrammar_p.h:188: error: ???QmlJSGrammar::<anonymous enum>??? is/uses anonymous type parser/qmljsgrammar_p.h:188: error: trying to instantiate ???template<class T> struct QConcatenable??? ...
* compile everything with QT_USE_FAST_CONCATENATIONOswald Buddenhagen2010-02-051-2/+1
|
* do not break on mingw with sh in PATHOswald Buddenhagen2009-11-241-2/+1
|
* macx: compile doc into the right directory instead of copying it laterOswald Buddenhagen2009-11-241-0/+2
|
* Fix wrong scoping in qtcreator.pridt2009-10-231-4/+4
| | | | Reported-By: Tasuku Suzuki
* Centralize S60 check, also use it for adding the GDB TRK page.Daniel Molkentin2009-10-061-0/+4
|
View Lorry Controller Status