Commit Graph

43 Commits

Author SHA1 Message Date
Oswald Buddenhagen
ac297f8e6b introduce QMakeHandler
this is QMakeEvaluatorHandler, but derived from QMakeParserHandler.
the idea is that the parser can be used stand-alone, while the evaluator
needs the parser as well.
we will need it in QMakeGlobals as well, so put it there, as that is the
most central place.

Change-Id: I6ee46c0e4b2e044bf3bfc6e4235b53525ddfc875
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:39:37 +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
95dfa15a7c ProFileEvaluator::Private => QMakeEvaluator
more natural name. the ProFileEvaluator class itself is somewhat more
high-level, so it will remain named as it is. i'll move around the code
at a later point.

Change-Id: I03fa844d0109e281f3602b4781ac11c6f2954aa4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:06:23 +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
37b2f88e27 ProFileOption => QMakeGlobals
more accurate class name

Change-Id: I4258b221727e79cc88d5f57dd1f6631ba0bba625
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:04:29 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-07-06 11:14:01 +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
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Oswald Buddenhagen
63d5dbd9ac support QT_INSTALL_IMPORTS in testreader 2011-04-06 21:36:03 +02:00
Oswald Buddenhagen
08deb39072 more exact qmake command line parsing
support -after and -config.
this also moves the actual parsing to ProFileOption, where it belongs.
2011-03-18 21:28:04 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Oswald Buddenhagen
058354ceab refactor ProFileEvaluator, part 2: split off ProFileParser 2010-06-18 21:21:36 +02:00
Oswald Buddenhagen
0c09acbb25 refactor ProFileEvaluator, part 1: introduce handler interface
externalize the error message and evaluation notification callbacks into
an own handler interface.
2010-06-18 21:21:36 +02:00
Oswald Buddenhagen
82b72b0897 deref instead of deleting
this would give a leak instead of a crash - if it was really
relevant at all.
2010-06-16 15:48:02 +02:00
Oswald Buddenhagen
b49a6e7842 add pro parser stuff to dependpath 2010-06-16 15:47:46 +02:00
Oswald Buddenhagen
a796ab559d don't leak ProFile objects
just for debugging ...
2010-04-20 12:02:10 +02:00
Oswald Buddenhagen
84a6d42f58 add verbose mode
this produces qmake-like output when recursing
2010-04-20 12:02:10 +02:00
Oswald Buddenhagen
bcf29992c3 eliminate duplicates from SUBDIRS
otherwise we may re-process subdirs multiple times in cumulative mode.
2010-04-20 12:02:10 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01: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
699af2f46a fix typo 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
Oswald Buddenhagen
aaf296ca21 remove forgotten proxmlreader test 2010-01-25 16:53:55 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Daniel Molkentin
70d6b50fc7 Bump copyright year everywhere. 2009-01-13 19:16:40 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
cf11b69643 more code cosmetics 2008-12-02 16:19:05 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00