Commit Graph

129 Commits

Author SHA1 Message Date
Orgad Shaneh
e9aaf21517 Centralize addition of plugin library paths
Change-Id: I9ddcc193b4d927c3d566eeb81c41f79a75920696
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-08 15:29:21 +02:00
Orgad Shaneh
b9f79cbd01 Clean some trailing whitespace
Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-07 16:19:47 +02:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
hjk
66f2793cbf Allow list of plugin directories to be passed in QTC_PLUGIN_DIRS
Change-Id: Ied926ed78f24d06ff0ff693d768e12ecb505ccbf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-03-24 19:25:11 +01:00
Eike Ziller
1911530f75 Mac/Qt4: Allow compilation with macx-clang mkspec too
Change-Id: I91752859f790b5576db7ec8678c58924f643187c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-07 14:43:39 +01:00
Eike Ziller
23e6a0ac09 Make C++11 unconditional
Change-Id: I88d6f99a1fa714386337589e1edda66b66091151
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-05 12:21:06 +01:00
Eike Ziller
5e7b693651 Version bump
Change-Id: Ibb0d0d64f379684b1ae8f7cd55a8a5436056432b
2014-03-03 10:27:59 +01:00
Eike Ziller
0d08b6f21d Update binary artifacts branch
Change-Id: Iea998510555e3762e6a8457bb6e998c3533c2dee
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-02-25 18:29:16 +01:00
Eike Ziller
9e40e5f7b0 Version bump
Change-Id: I005fb91b5e3cd5956edb108d0ec730db64cc98e9
2014-02-25 13:16:28 +01:00
Eike Ziller
b03a981a41 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
2014-02-11 09:14:22 +01:00
Kai Koehne
f33e05dc6e Enable C++11 on all platforms except Mac/release
This allows us to profit from the Qt extensions for C++11, and also
makes sure e.g. QTC_OVERRIDE is consistenly checked. We can't enable
it (yet) for Mac/release though to be able to deploy to 10.6 ..

Change-Id: Icd26ab5f971532ff10a892221c653987026ac88d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-06 15:28:26 +01:00
Eike Ziller
51af63bb9e Version bump
Change-Id: Ie852069d4c3f01eb021837644865fdea41a34c54
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-29 10:38:07 +01:00
Kai Koehne
79f72f7a89 Pick up QTC_PLUGIN_DIRS from environment
Setting QTC_PLUGIN_DIRS as an environment variable is easier
to manage than passing it every time explicitly to e.g. the qmake
call. It also is in line with other environment variables used in
Qt Creator, like WITH_LLDB, QT_BREAKPAD_ROOT_PATH etc.

Change-Id: Ief94aaf7c2a16ee62dcbf27c9f217496b1f74ad5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-23 12:21:14 +01:00
Eike Ziller
8cad383b80 Merge remote-tracking branch 'origin/3.0' 2013-12-18 15:10:58 +01:00
Eike Ziller
83a3705912 Fix build with Qt4
Change-Id: I1ef1f20d776f955c2f08d551dbac1621b98c0961
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-12-18 12:51:43 +01:00
Eike Ziller
e035ae6df1 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
2013-12-18 11:02:16 +01:00
Kai Koehne
27563451cb Allow plugins to depend on plugins outside of creator source tree
Do try to resolve plugin_dependencies.pri files in all directories
set by QTC_PLUGIN_DIRS. Also fail if a dependencies_pri file cannot
be resolved.

Change-Id: I2c14db832cef0fcc97a2f0351847c4969f5bd420
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-12-17 08:54:03 +01:00
Eike Ziller
5f2fe51c52 Mac: Remove code that was there for 10.4 compatibility
Change-Id: Ibb586513f256deb5e0e8aa7c5100055482a031a9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-10 08:31:06 +01:00
Eike Ziller
ae475faa49 Version bump
Change-Id: I9bf6bbeefcfce9759f8b10e0d5dfb9864315beb4
2013-12-03 12:48:26 +01:00
Eike Ziller
ba03037561 Bump version
Change-Id: I124bfc5ed26f2d64028c72e89539c16d5d3836be
2013-11-25 08:55:29 +01:00
Eike Ziller
ff3b32ac83 Version bump
Change-Id: Id68423b08a6f7e0d295e7b065d7c50d25f914541
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-06 10:24:29 +01:00
David Schulz
520c9ab342 CdbExt: Checkout branch 3.0 of binary-artifacts repository.
Change-Id: Ice27f5cc433f436cdb0445b14ba2902c601d5295
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-23 15:37:27 +02:00
Eike Ziller
8069fe35e3 Version bump
Change-Id: I0ea3a31a430cae57e72fc1be6e9305d56597d503
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-16 11:28:00 +02:00
Eike Ziller
1a202ba5d0 Version bump
Change-Id: I6d0e52f57fe0e2c762ba12a9ed86de2458463772
2013-10-04 17:07:23 +02:00
Orgad Shaneh
ac7a7f8350 MSVC: Prevent incremental linking on debug builds
Makes startup times with cdb (a bit) less painful.

Change-Id: Ib6f4d11a2e6cfc561cc2c5c5598d0751a76208cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-26 19:19:00 +02:00
Eike Ziller
cc7c3c9623 Add QTCREATOR_COMPAT_VERSION
Necessary for keeping compatibility within a minor series.
When bumping versions, the compatVersion now needs to be taken into
account too.

Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 15:14:10 +02:00
Eike Ziller
3c32bb8668 use master branch of binary artifacts
Change-Id: I25a7c780df5d6ddec5984be0e753d68c0bb79b63
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-28 11:31:08 +02:00
Eike Ziller
c9128b7fdd Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
2013-06-27 14:24:57 +02:00
David Schulz
ee70e9d267 Checkout correct branch of the binary-artifacts repository.
Change-Id: Id54a06a6636588a029de2e2f72d50edcf7ceaaa3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-26 16:12:08 +02:00
Eike Ziller
965966fb47 Version bump
Change-Id: Ibf982c6aac6b0d097d4ec764399197af7a2fe03a
2013-06-26 13:39:40 +02:00
Eike Ziller
80cef80910 Version bump.
Change-Id: I69393d9b2aca0e4a702af8385020547bf89ba6fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-31 08:52:47 +02:00
Eike Ziller
4d131257f9 Version bump
Change-Id: I3719f99180012d82af603134360fdd9eedab24f9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-30 14:23:36 +02:00
Eike Ziller
cccc39ccc7 Version bump
Change-Id: I740c2db6660713aa8db192464c96ce91d827b0e5
2013-05-29 11:57:08 +02:00
Oswald Buddenhagen
66a3553107 make library and plugin dependencies declarative
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>
2013-04-03 14:37:45 +02:00
Oswald Buddenhagen
c61210089f define QT_CREATOR centrally
numerous "3rdparty" libraries have respective #ifdefs, and consequently
the define is added in several places. it's quite a mess with the .pr?
and .qbs files, though. solve the problem by sidestepping it.

Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 12:20:37 +02:00
Orgad Shaneh
8ae9d61b3c Enable WITH_TESTS when BUILD_TESTS is specified
Change-Id: Ie871ea099caa08b2757303e81733acc5ed6294de
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-27 15:38:19 +01:00
Oswald Buddenhagen
b3c017c341 Merge branch '2.7' 2013-02-07 10:20:03 +01:00
Kai Koehne
2dfc3ce2e1 Bump Qt Creator version
Change-Id: If7972209cb9346217af43f9c1faa667bf644a54a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-05 14:23:57 +01:00
Orgad Shaneh
a9e3db2283 Project: Only add qbs file if it exists
Change-Id: I2d49644b63bad9b7ffa7d088f443ed6ec2fc85ed
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-04 11:49:31 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00
Eike Ziller
387f5a7006 Merge remote-tracking branch 'origin/2.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
2012-11-26 10:52:28 +01:00
Erik Verbruggen
9820278a70 Fix building against Qt5 on MacOS.
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>
2012-11-26 09:36:54 +01:00
Eike Ziller
0ae621ba4e Version bump.
Change-Id: Ifea253aaa719d020926a17498dc23b76134e0534
2012-11-15 10:32:59 +01:00
Eike Ziller
fe74a9a722 Merge remote-tracking branch 'origin/2.6'
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
2012-11-09 11:20:10 +01:00
Nikolai Kosjar
fb61be5ed6 Qt5: Correct usage of testlib.
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>
2012-11-05 12:58:53 +01:00
Eike Ziller
0ca5d23f51 Version bump.
Change-Id: I978a6d435c53276a0f7a024e534278aa5f794ebb
2012-11-05 09:16:22 +01:00
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
2012-10-25 10:45:58 +02:00
Nikolai Kosjar
112f80c6c6 Qt5: Fix warning "qtestlib is deprecated".
"Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib
instead."

Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-24 13:51:16 +02:00
Eike Ziller
d8e6a314e5 Version bump
Change-Id: Id0b100ae13cdd5edd82614c10bdf0cdeb45e6615
2012-10-18 09:41:49 +02:00
Eike Ziller
70b5e1f64d Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
2012-10-16 17:42:10 +02:00