Commit Graph

223 Commits

Author SHA1 Message Date
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6'
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
2012-09-12 17:27:37 +02:00
Oswald Buddenhagen
6706df97ac use new qmake functions under qt5
waaaay faster than the hand-crafted ones

Change-Id: Ia4f60207b26a01752ca1eeddf1d8a76381cd1710
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-11 17:27:40 +02:00
Oswald Buddenhagen
d472a6638b use the right reference variable for source path
$$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>
2012-09-11 17:27:11 +02:00
Eike Ziller
fa094b2261 Version bump.
Change-Id: I9e4f32135a36ab15888e2461c3ec599ea11c6dfd
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-11 13:54:40 +02:00
Eike Ziller
da70f19ba0 Version bump.
Change-Id: If3c1355c49d0447a012c034cc4ff05a80a604767
2012-09-10 08:58:34 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
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 c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:40 +02:00
Eike Ziller
7337152c1e Revert "No QTC_PREFIX default on Windows. Causes too many funny side effects."
Because the change depends on reverted commit
c29bf6f652

This reverts commit 550f8218de.

Change-Id: If287c4b126b1ef710c074fd85946da41161c6ba9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:30 +02:00
Daniel Molkentin
550f8218de No QTC_PREFIX default on Windows. Causes too many funny side effects.
Change-Id: Ic6448d7ef95f4ff95df8fddd1b78f4071fa5118f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-06 15:35:26 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
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>
2012-09-05 16:37:42 +02:00
Robert Loehning
b674b59b3d Version bump.
Change-Id: Id09e96eb96903c9a758848dbbea79259a624ef12
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-27 07:55:04 +02:00
Robert Loehning
a6c1d88fa4 Version bump.
Change-Id: Ibbd3568439e4ea3296afda92ad6b4507f622f9bd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-24 18:45:21 +02:00
Eike Ziller
bdbcb1f8af Version bump.
Change-Id: I889b2f6a572bfc6083cd2129b51a18f5250699fd
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-25 14:26:05 +02:00
Thiago Macieira
fb89bfe949 Request Qt pre-5.0 API for Qt 5 builds
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>
2012-06-07 10:45:03 +02:00
Friedemann Kleint
489feeae15 Compile with Qt 5.
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>
2012-03-13 17:20:50 +01:00
Eike Ziller
142d2338c5 version bump
Change-Id: I3dd7939a388f67a5addb4313032f182e9672caf1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-29 11:40:49 +01:00
Konstantin Tokarev
af6b2dc6ae Don't build universal binary on PPC host by default.
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>
2012-02-13 08:52:38 +01:00
Friedemann Kleint
622cac50f4 Move QtConcurrent library into Utils.
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>
2012-02-09 12:33:10 +01:00
Friedemann Kleint
1d1d2f0b74 Compile with Qt 5.
- 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>
2012-02-08 15:47:00 +01:00
Friedemann Kleint
b0eff051c1 Add Qt 5 libraries to .pro files.
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>
2011-11-24 12:02:30 +01:00
Friedemann Kleint
b02fb69daf qtcreator.pri: Fix version check to recognize Qt 5.
Change-Id: Ia98345a1ee5be3cc804679772bbcbaf3431468eb
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-22 11:35:43 +01:00
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4'
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
2011-10-28 10:17:44 +02:00
Eike Ziller
0cabfcf5d9 Version bump.
Change-Id: Ia3d10553312520293ad935812792f9b2a1fd3b7a
2011-10-20 18:47:00 +02:00
Oswald Buddenhagen
f7ca927b68 compile with Visual Studio IDE, take 2
Change-Id: I30147eeb58e44ef137fb25763f6be6b4d247d6c7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-18 12:14:10 +02:00
Oswald Buddenhagen
58cc0c5a5c de-obfuscate code
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>
2011-10-18 12:13:51 +02:00
Eike Ziller
1868dd94f0 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: Ie1ecdbaefb9cabebd90bc7c0f8837cc31dbac5af
2011-10-17 16:44:41 +02:00
Robert Loehning
429d62823b Revert "Compile with Visual Studio IDE: string macros don't need to be escaped"
This reverts commit fe80df7e2f.

With the above commit, Creator could not be compiled with MSVC 2008.

Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-17 15:52:05 +02:00
Eike Ziller
8eb8368139 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
2011-10-17 14:22:32 +02:00
Peter Kuemmel
fe80df7e2f Compile with Visual Studio IDE: string macros don't need to be escaped
Merge-request: 400
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I81f335b44fe736f3ffc9ba3212de25edf8589dd1
2011-10-17 11:28:28 +02:00
Eike Ziller
7e3d41da58 Version bump
Change-Id: I5a5079377d043c30c7aabefb2c11a4437ae6c92c
2011-10-17 11:02:12 +02:00
Eike Ziller
1173d75aa8 Version bump.
Change-Id: Ibcc35096447619f39a8c8fc69d11db00184be726
2011-10-05 23:09:10 +02:00
Eike Ziller
bbfa7e0020 Merge app_version.h and ide_version.h
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>
2011-08-31 13:48:00 +02:00
con
c699740f9f Version bump.
Change-Id: I6c284e1b18388a2f9e1bad2ef0802b75d5124975
2011-06-29 00:36:09 +02:00
Oswald Buddenhagen
71baeb1d77 Merge remote-tracking branch 'origin/2.2' 2011-03-15 18:01:35 +01:00
Thiago Macieira
4615a8f88c Make sure plugins on Linux resolve all dependencies
Remove the previous code which hardcoded options and didn't work for
linux-icc.

Reviewed-By: dt
2011-03-15 12:50:59 +01:00
con
476223cdd6 Merge remote branch 'origin/2.2' 2011-03-11 09:26:43 +01:00
Tobias Hunger
75f819848f Symbian: Remove S60devices
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
2011-03-10 16:04:42 +01:00
Oswald Buddenhagen
7007326837 clean up DEPENDPATH insanity
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.
2011-03-09 22:24:13 +01:00
Tobias Hunger
b168b15978 Symbian: Remove S60devices
Remove S60devices and all the code surrounding it. This gets rid of
the S60 devices tab in the options dialog, too.

Tasknumber: QTCREATORBUG-3681
2011-03-09 12:27:28 +01:00
con
663a94daf9 Version bump. 2011-03-07 20:37:26 +01:00
con
740743dc25 Implement an external tool container + xml parsing. 2011-02-18 17:15:34 +01:00
dt
4160e9557c Creator: Also warn off undefined symbols on linux-g++
Patch by Fabo
2011-01-21 13:35:22 +01:00
con
bc3a1ca294 Mac: Explicitly do a 10.5+ build if not doing a tiger compatible build.
Qt for some reason doesn't tell the tool chain to require 10.5 when
doing a cocoa build but on x86.
2010-11-18 17:17:25 +01:00
Oswald Buddenhagen
9532d4a345 dynamically replace creator version during build
... instead of running a sed script over a lot of files on each
version increment.
2010-11-03 17:47:41 +01:00
con
49b86e7717 Mac: Use rpath instead of executable_path.
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.
2010-11-01 15:00:25 +01:00
Kai Koehne
cb48aad9d2 QmlDesigner: Improve Qt version check in plugins.pro
Reviewed-by: Thomas Hartmann
2010-09-29 16:44:52 +02:00
Oswald Buddenhagen
d4ea3f523b add include guard for qtcreator.pri
this also covers the higher-level includes for libs and plugins
2010-09-10 11:05:19 +02:00
Lasse Holmstedt
5b4a85dffe QML Observer: reverted hack, fixed compilation for ibmake
see 576642a76a for details
2010-08-05 11:53:12 +02:00
con
af44136e22 Merge remote branch 'origin/2.0'
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
2010-06-24 11:40:22 +02:00
dt
2bd2373b38 Remove LD_LIBRARY_PATH script.
Christian Kamm convinced me that it should not have any effect.

Reviewed-By: ckamm

Task-Nr: QTCREATORBUG-1646
2010-06-22 12:47:04 +02:00
con
e4871393c6 QmlJS: Fix target directory for qmldump executable on Mac.
Reviewed-by: ckamm
2010-06-10 10:25:58 +02:00