| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
| |
Previously sql driver recipes each appeared in both the plugin
pro file and src/sql/drivers/drivers.pri for building into QtSql.
Split driver recipes into shared pri files.
Also split bundled 3rd party sqlite code recipe into a shared pri.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
|
| |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
The scope "win32-g++" comes from the name of the makespec. However, it
is frequently used to check for MinGW. This works fine as long as
win32-g++ is the only makespec for MinGW. Now we need the wildcard
to cover "win32-g++-cross" as well.
Also reordered test of win32 before win32-g++*.
Also took opportunity to use else.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QT_LFLAGS_PSQL can introduce -lz. To respect qt-zlib, this must be
be removed so that zlib will come from -lQtCore4. Otherwise, linking
can fail due to there being two different libraries providing zlib.
This affects building shared Qt.
This patch fixes the problem for win32-g++ and also unix. Assumed
that QT_LFLAGS_PSQL is set in configure step if -lpq is not enough.
Not sure why parallel logic is in src/sql/drivers/drivers.pri but
I fixed that too.
Merge-request: 405
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
