| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I4e95a63b730385bcb83d57b1e324b0edda321286
|
|
|
|
| |
Change-Id: Iaa0f01db8f03d078437681d36e0b0e9ae29b7351
|
|
|
|
| |
Change-Id: Ia3d10553312520293ad935812792f9b2a1fd3b7a
|
|
|
|
|
|
| |
Change-Id: I30147eeb58e44ef137fb25763f6be6b4d247d6c7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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-request: 400
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I81f335b44fe736f3ffc9ba3212de25edf8589dd1
|
|
|
|
| |
Change-Id: I5a5079377d043c30c7aabefb2c11a4437ae6c92c
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Change-Id: I6c284e1b18388a2f9e1bad2ef0802b75d5124975
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Remove the previous code which hardcoded options and didn't work for
linux-icc.
Reviewed-By: dt
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| | |
Remove S60devices and all the code surrounding it. This gets rid of
the S60 devices tab in the options dialog, too.
Tasknumber: QTCREATORBUG-3681
|
|/ |
|
| |
|
|
|
|
| |
Patch by Fabo
|
|
|
|
|
| |
Qt for some reason doesn't tell the tool chain to require 10.5 when
doing a cocoa build but on x86.
|
|
|
|
|
| |
... instead of running a sed script over a lot of files on each
version increment.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
Reviewed-by: Thomas Hartmann
|
|
|
|
| |
this also covers the higher-level includes for libs and plugins
|
|
|
|
| |
see 576642a76a6ed6010de633bfcef7f29f9c3f259c for details
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
Christian Kamm convinced me that it should not have any effect.
Reviewed-By: ckamm
Task-Nr: QTCREATORBUG-1646
|
| |
| |
| |
| | |
This reverts commit 5234c775f765a and 210652912b728e9c.
|
| |
| |
| |
| |
| |
| |
| |
| | |
- 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
|
|/
|
|
| |
Reviewed-by: ckamm
|
|
|
|
| |
Requested-by: Friedemann Kleint
|
| |
|
|
|
|
| |
... so just disable it for all macs.
|
|
|
|
| |
includes workaround for breakage with old g++
|
|
|
|
| |
Only revert stuff that is linked to fast string concat.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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???
...
|
| |
|
| |
|
| |
|
|
|
|
| |
Reported-By: Tasuku Suzuki
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Instead use qmake IDE_LIBRARY_BASENAME=lib64 to set it to lib64.
|
|
|
|
|
| |
This is helpfull for building plugins from outside
the QtCreator source tree.
|
|
|
|
|
|
|
|
|
| |
use the data copying custom compiler approach here, too.
this leaves more work to qmake, which is good.
on the upside, pluginspecs will be installed when they change without
having force a re-link of the plugin itself.
on the downside, installation of a pluginspec will force a re-link of
the plugin. oh, well - you can't have it all (with qmake) ...
|
| |
|
|
|
|
| |
IDE_LIBEXEC_PATH is still the bindir, so it's kinda fake. oh, well.
|
| |
|