Commit Graph

21 Commits

Author SHA1 Message Date
Christian Stenger
eff72258be ProParser: Fix compile of manual test
Amends 58d288b52.

Change-Id: I5c142b0ce30f7145db6a8d332c8f0617e2c99fe5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-15 08:32:20 +00:00
hjk
52b2ca55c9 Replace QT_USE_FAST_{OPERATOR_PLUS,CONCATENTION} by QT_USE_QSTRINGBUILDER
QT_USE_FAST_CONCATENATION doesn't do anything nowadays.

Using QT_USE_QSTRINGBUILDER is the same as QT_USE_FAST_OPERATOR_PLUS
for QStrings and enables more QStringBuilder use for QByteArrays.

Change-Id: Ibd297817c50d86661d47822799f989447249af1b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-07 12:45:03 +00:00
Christian Stenger
44a282396f Tests: Fix build with MSVC 2017
Change-Id: I252ec40b026719f6cd5446b61b63dfdbd20e8ae9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-07 10:35:52 +00:00
Andre Hartmann
82b22a552f QMake: Fix build with b884f6fdbc and BUILD_TESTS enabled
qchar.h: In member function ‘QMakeEvaluator::VisitReturn
    QMakeEvaluator::evaluateBuiltinConditional(
        int, const ProKey&, const ProStringList&)’:
qchar.h:562:5: error: ‘QChar::QChar(char)’ is private
     QChar(char c) Q_DECL_NOTHROW;

Change-Id: Idd25b20ecf68a2e801b73e916a5359ff3fc7a86f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-05 12:47:05 +00:00
Oswald Buddenhagen
66802ef8bf implement simple VFS to support caching during project parsing
this tremendously speeds up loading of qt 5.1 based projects (including
qt itself) under mac os, as these look up the sdk dynamically, and use
caching to avoid doing that in every subproject.

Change-Id: I833253f81c3159056fab2ff888f293b36cc2ef56
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-04 15:42:13 +02:00
Oswald Buddenhagen
aca1c4bd50 introduce PROEVALUATOR_FULL #define
if this is enabled, the evaluator implements all functionality
necessary for qmake. without it, functionality which is unnecessary or
outright dangerous in qt creator or lupdate context is omitted.

Change-Id: I233cfa6daf2e4451f9f1d3d14711be2a7cfe4293
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:18:29 +02:00
Oswald Buddenhagen
41bf7c896b surround loading of spec with loading spec_pre.prf and spec_post.prf
follow suit with qmake ...

once we move currently builtin functionality to these feature files,
things would break with qt4 (which does not have them). consequently,
we provide our own fallback versions of them.

Change-Id: Ie318f3419d78214472835c41ec1388977f2e9269
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 13:00:00 +02:00
Oswald Buddenhagen
b4f38671a2 move remainder of QMakeEvaluator to an own file
Change-Id: I09bf3ee41e08062e14a6810d8de036e1c246b0b5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 12:23:31 +02:00
Oswald Buddenhagen
7b3393918c move builtin qmake function implementations to separate file
the functions are still part of the same class, though.

Change-Id: I58a69d334ac9d1d53b5395d0b655895ffe18c7be
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:11:24 +02:00
Oswald Buddenhagen
c84fbe0455 move QMakeEvaluator declaration to an own file
Change-Id: Ifc13af5f5b8a2b497075027acfb7b621ab0514ad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:06:40 +02:00
Oswald Buddenhagen
888c187dd5 ProFileParser => QMakeParser
more natural name

Change-Id: I38d2a2fc785686aa5777afe41452b53f2c24adf8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:05:03 +02:00
Oswald Buddenhagen
24f24c4546 factor QMakeGlobals into an own file
Change-Id: I55d24be06fa78f70bad614a7125c3079c92ab8e5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:04:47 +02:00
Oswald Buddenhagen
3cb595fa34 add ProFileOption::initProperties()
centralize support for default-initialization of qmake properties with,
duh, qmake (-query).

Change-Id: If97725fa61779819f6afb9073042b667d7253e5d
Reviewed-on: http://codereview.qt.nokia.com/308
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-01 16:43:51 +02:00
Oswald Buddenhagen
b0d764cf95 make cumulative mode support in ProFileEvaluator optional
just in case it gets used for something "real" ...

making exact mode optional would make no sense, as feature files always
need to be evaluated exactly for meaningful results.

Change-Id: I568ab751cf74790e0f79b54248202412c39a68ea
Reviewed-on: http://codereview.qt.nokia.com/306
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-01 16:43:35 +02:00
Oswald Buddenhagen
058354ceab refactor ProFileEvaluator, part 2: split off ProFileParser 2010-06-18 21:21:36 +02:00
Oswald Buddenhagen
b49a6e7842 add pro parser stuff to dependpath 2010-06-16 15:47:46 +02:00
Kai Koehne
6c4b9ba227 Reapply unconnected changes from reverted commit
Only revert stuff that is linked to fast string concat.
2010-02-08 11:13:55 +01:00
Kai Koehne
999c73ad9d Revert "compile everything with QT_USE_FAST_CONCATENATION"
This reverts commit e70530c5ad. 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???
...
2010-02-08 10:56:50 +01:00
Oswald Buddenhagen
e70530c5ad compile everything with QT_USE_FAST_CONCATENATION 2010-02-05 15:20:25 +01:00
Oswald Buddenhagen
a2dbeecdec remove visitor pattern
it's overengineered for our purpose and would just get in the way of
planned optimizations.
2010-02-05 15:20:25 +01:00
Oswald Buddenhagen
567d7ed397 add minimal test program for profileevaluator 2010-01-25 16:53:56 +01:00