| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| | |
Change-Id: Ia4cc4447e59aaa4f283a7818847633bb7cf9a8aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
| |
| |
| |
| | |
Change-Id: I499d35c45344c21eb4b8aae9e3bab4eb59e13544
|
| |
| |
| |
| | |
Change-Id: I0c690e5010ade7f3ebbb4a94163d7b44da13c10d
|
| |
| |
| |
| | |
Change-Id: I796d981e9b19a54d9ef9ef735d0f72d9ad0b1d34
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qbs/imports/QtcTool.qbs
src/plugins/git/giteditor.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
|
| |
| |
| |
| |
| |
| | |
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
|
| |
| |
| |
| | |
Change-Id: Ibb0d0d64f379684b1ae8f7cd55a8a5436056432b
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
And also in the qbs sub-project (for the qbs and qmake builds). This
becomes possible with the qbs submodule update that is part of this
patch.
Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|/
|
|
| |
Change-Id: I005fb91b5e3cd5956edb108d0ec730db64cc98e9
|
|\ |
|
| |
| |
| |
| |
| | |
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|/
|
|
| |
Change-Id: I6d0e52f57fe0e2c762ba12a9ed86de2458463772
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Qml editor widgets were still linking against declarative
for qml type registering. Registering is no longer necessary
since they are no longer used in QML.
Also removes the unused qtcomponents.
qmlpuppet of course still links against declarative, but that's not run
in the same process.
Task-number: QTCREATORBUG-10273
Change-Id: Ied12d38d58da5ff3bc694905b84dcd76cbce03af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|
|
|
|
|
|
| |
We need this to build plugins located outside the source tree.
Change-Id: Ie587b5e838bf0ce67b19d3222bbc40b53b888e69
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Note: Since not all autotests are able to run from an installed location,
we need to be able to start them from the build directory, which
in turn forces us to set a destination directory for libraries and plugins,
so they will be found at run-time.
Change-Id: Idcf7e1333dfa6e9dbf745391b78c035f842ccc5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
The one that is left is the only one that's actually a function taking
real input.
This saves a number of includes.
Change-Id: I77e777bbf6ed7ed4086f9a40de4dc3dd8c91a7af
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
The qmake project has this as well. Will become more useful later on.
Change-Id: I6e9b6b1d1a46ea6263a6d5fac4cb30d883a3e077
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
| |
| |
| |
| | |
Change-Id: Ibf982c6aac6b0d097d4ec764399197af7a2fe03a
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Use sub-projects.
- Move the main application and the application header products
into dedicated files.
As a result, qtcreator.qbs becomes much simpler to understand,
consisting now of just a bunch of global properties and a few sub-project
references.
Change-Id: Ic7300d489d3982394be5ad1d12a79a2914320298
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/fakevim/fakevimhandler.cpp
Change-Id: I8101f18b87859924644471817d4f1408790d5628
|
| |
| |
| |
| |
| |
| |
| | |
Use the new contains function and the targetOS list.
Change-Id: I38b995eb9328e449befad85792512c45670cc8c9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/coreplugin/documentmanager.cpp
Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94
|
| |
| |
| |
| |
| |
| |
| | |
These nicely show up in the project tree in Qt Creator then.
Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I69393d9b2aca0e4a702af8385020547bf89ba6fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|/
|
|
|
| |
Change-Id: I3719f99180012d82af603134360fdd9eedab24f9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
|
|
|
|
| |
Change-Id: I740c2db6660713aa8db192464c96ce91d827b0e5
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/android/androiddebugsupport.cpp
src/plugins/qtsupport/qtsupport.qbs
Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
|
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes a bunch of warning when building with the updated qbs
version.
Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ia0714b038bc1655bb3b5b44a98f9fd6093bcdf79
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Needs updated qbs submodule for rpath fixes and installNamePrefix.
Change-Id: I6428409f34e87f299ff2d8c72268bee72c1ba2f2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
First step in fixing the Mac build
Change-Id: I86659b9b46c01fc17fd93b8ffc3b378d2b580c36
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/pythoneditor/tools/lexical/pythonformattoken.h
Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit a9754611f667d252ac015f2c8260caaf8dfbc909.
That patch does not work as-is, because it introduces a dependency from
the qtcreator library to the Core plugin without adding the respective
directory to the list of rpaths. While doing just that would make Creator
start up again, it seems conceptually wrong, because the Core plugin is
explicitly loaded by the application itself. Removing the dependency
altogether seems like the cleaner solution overall.
Change-Id: Ife7b726449701a0a61eb48d98c04c55a55cf47e3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
| |
| |
| |
| | |
Change-Id: I4cd263b2f85ae4a342af68d156893bbaf9d2f90b
|
| |
| |
| |
| |
| | |
Change-Id: Iae22c2185fb0bde2509a0f6a9a975be4e7c2077c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/debugger/gdb/gdbengine.cpp
Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
|
| |
| |
| |
| |
| | |
Change-Id: I5f439e850cbfbb0a1a4802e2dd063687a75afc68
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
| |
| |
| |
| | |
Change-Id: I97f84d16a092348332c18ad6ce34acc96d9a540f
|
| |
| |
| |
| |
| | |
Change-Id: Ic3a6cf5d4ddb16034e7ba86c95870feee0713b6a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Commit 7bf21ea94f800b4540a8d720f2f0b4341e4b5652 changed "import" to
"Import" in qtcreator.qbs for some reason.
Change-Id: Ica2425ffa0331be51a0847ef4d3b3b2736fc323f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I24952ea89519cf37c021d79f480c1ae907789161
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/qnx/blackberrydeployconfiguration.cpp
Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
|
| |
| |
| |
| |
| |
| | |
Change-Id: Idf2c04e250be7fcbbb927f423b5651d58a0d4bac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
| |
| |
| |
| |
| |
| |
| | |
After enabling the plugin go to Tools|Diff...
Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
|
| |
| |
| |
| |
| |
| |
| |
| | |
Rationale: "qbs run -p qtcreator" will otherwise fail on a clean
build dir, because Creator cannot run without the Core plugin.
Change-Id: I87c16847189fc09bcc4903e865b99b6ba472f1f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|