Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
20 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/plugins/sqldrivers/db2/db2.pro

    r2 r846  
    1 TARGET  = qsqldb2
     1TARGET = qsqldb2
    22
    3 HEADERS         = ../../../sql/drivers/db2/qsql_db2.h
    4 SOURCES         = main.cpp \
    5                   ../../../sql/drivers/db2/qsql_db2.cpp
    6 
    7 unix:!contains( LIBS, .*db2.* ):LIBS    *= -ldb2
    8 win32:!contains( LIBS, .*db2.* ):LIBS   *= -ldb2cli
     3SOURCES = main.cpp
     4include(../../../sql/drivers/db2/qsql_db2.pri)
    95
    106include(../qsqldriverbase.pri)

  • trunk/src/plugins/sqldrivers/db2/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/sqldrivers/ibase/ibase.pro

    r2 r846  
    1 TARGET  = qsqlibase
     1TARGET = qsqlibase
    22
    3 HEADERS         = ../../../sql/drivers/ibase/qsql_ibase.h
    4 SOURCES         = main.cpp \
    5                   ../../../sql/drivers/ibase/qsql_ibase.cpp
    6 
    7 unix:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS    *= -lgds
    8 
    9 win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) {
    10         !win32-borland:LIBS *= -lgds32_ms
    11         win32-borland:LIBS  += gds32.lib
    12 }
     3SOURCES = main.cpp
     4include(../../../sql/drivers/ibase/qsql_ibase.pri)
    135
    146include(../qsqldriverbase.pri)

  • trunk/src/plugins/sqldrivers/ibase/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/sqldrivers/mysql/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/sqldrivers/mysql/mysql.pro

    r792 r846  
    1 TARGET  = qsqlmysql
     1TARGET = qsqlmysql
    22os2:TARGET_SHORT = qmysql
    33
    4 HEADERS         = ../../../sql/drivers/mysql/qsql_mysql.h
    5 SOURCES         = main.cpp \
    6                   ../../../sql/drivers/mysql/qsql_mysql.cpp
    7 
    8 unix: {
    9     isEmpty(QT_LFLAGS_MYSQL) {
    10         !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
    11             use_libmysqlclient_r:LIBS *= -lmysqlclient_r
    12             else:LIBS *= -lmysqlclient
    13         }
    14     } else {
    15         LIBS *= $$QT_LFLAGS_MYSQL
    16         QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
    17     }
    18 }
    19 
    20 win32:!contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*) {
    21     LIBS     *= -llibmysql   
    22 }
     4SOURCES = main.cpp
     5include(../../../sql/drivers/mysql/qsql_mysql.pri)
    236
    247os2 {

  • trunk/src/plugins/sqldrivers/oci/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/sqldrivers/oci/oci.pro

    r2 r846  
    1 TARGET  = qsqloci
     1TARGET = qsqloci
    22
    3 HEADERS         = ../../../sql/drivers/oci/qsql_oci.h
    4 SOURCES         = main.cpp \
    5                   ../../../sql/drivers/oci/qsql_oci.cpp
    6 
    7 win32:LIBS      *= -loci
    8 
    9 unix:!contains( LIBS, .*clnts.* ):LIBS  *= -lclntsh
    10 
    11 macx:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ
     3SOURCES = main.cpp
     4include(../../../sql/drivers/oci/qsql_oci.pri)
    125
    136include(../qsqldriverbase.pri)

  • trunk/src/plugins/sqldrivers/odbc/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/sqldrivers/odbc/odbc.pro

    r769 r846  
    1 TARGET  = qsqlodbc
     1TARGET = qsqlodbc
    22
    3 HEADERS         = ../../../sql/drivers/odbc/qsql_odbc.h
    4 SOURCES         = main.cpp \
    5                   ../../../sql/drivers/odbc/qsql_odbc.cpp
    6 
    7 unix {
    8         !contains( LIBS, .*odbc.* ) {
    9             LIBS        *= $$QT_LFLAGS_ODBC
    10         }
    11         DEFINES += UNICODE
    12 }
    13 
    14 win32 {
    15         !win32-borland:LIBS     *= -lodbc32
    16         win32-borland:LIBS      *= $(BCB)/lib/PSDK/odbc32.lib
    17 }
     3SOURCES = main.cpp
     4include(../../../sql/drivers/odbc/qsql_odbc.pri)
    185
    196include(../qsqldriverbase.pri)

  • trunk/src/plugins/sqldrivers/psql/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/sqldrivers/psql/psql.pro

    r803 r846  
    1 TARGET  = qsqlpsql
     1TARGET = qsqlpsql
    22os2:TARGET_SHORT = qpsql
    33
    4 HEADERS         = ../../../sql/drivers/psql/qsql_psql.h
    5 SOURCES         = main.cpp \
    6                   ../../../sql/drivers/psql/qsql_psql.cpp
    7 
    8 unix: {
    9     !isEmpty(QT_LFLAGS_PSQL) {
    10         LIBS *= $$QT_LFLAGS_PSQL
    11         QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
    12     }
    13     !contains(LIBS, .*pq.*):LIBS *= -lpq
    14 }
    15 
    16 win32:!contains(LIBS, .*pq.* ) {
    17     !win32-g++:LIBS    *= -llibpq       
    18     win32-g++:LIBS *= -lpq     
    19     LIBS    *= -lws2_32 -ladvapi32
    20 }
     4SOURCES = main.cpp
     5include(../../../sql/drivers/psql/qsql_psql.pri)
    216
    227os2 {

  • trunk/src/plugins/sqldrivers/sqlite/smain.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/sqldrivers/sqlite/sqlite.pro

    r769 r846  
    1 TARGET  = qsqlite
     1TARGET = qsqlite
    22os2:TARGET_SHORT = qsqlit
    33
    4 HEADERS         = ../../../sql/drivers/sqlite/qsql_sqlite.h
    5 SOURCES         = smain.cpp \
    6                   ../../../sql/drivers/sqlite/qsql_sqlite.cpp
    7 
    8 !system-sqlite:!contains( LIBS, .*sqlite.* ) {
    9     CONFIG(release, debug|release):DEFINES *= NDEBUG
    10     DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE
    11     INCLUDEPATH += ../../../3rdparty/sqlite
    12     SOURCES += ../../../3rdparty/sqlite/sqlite3.c
    13 } else {
    14     LIBS *= $$QT_LFLAGS_SQLITE
    15     QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE
    16 }
     4SOURCES = smain.cpp
     5include(../../../sql/drivers/sqlite/qsql_sqlite.pri)
    176
    187wince*: DEFINES += HAVE_LOCALTIME_S=0

  • trunk/src/plugins/sqldrivers/sqlite2/smain.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/sqldrivers/sqlite2/sqlite2.pro

    r2 r846  
    1 TARGET  = qsqlite2
     1TARGET = qsqlite2
    22
    3 HEADERS         = ../../../sql/drivers/sqlite2/qsql_sqlite2.h
    4 SOURCES         = smain.cpp \
    5                   ../../../sql/drivers/sqlite2/qsql_sqlite2.cpp
    6 
    7 !contains(LIBS, .*sqlite.*):LIBS *= -lsqlite
     3SOURCES = smain.cpp
     4include(../../../sql/drivers/sqlite2/qsql_sqlite2.pri)
    85
    96include(../qsqldriverbase.pri)

  • trunk/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro

    r561 r846  
    33
    44# We just want to export the sqlite3 binaries for Symbian for platforms that do not have them.
    5 symbian {
     5symbian-abld|symbian-sbsv2 {
    66    !symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) {
    77        BLD_INF_RULES.prj_exports +=  ":zip SQLite3_v9.2.zip"

  • trunk/src/plugins/sqldrivers/tds/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/sqldrivers/tds/tds.pro

    r2 r846  
    1 TARGET  = qsqltds
     1TARGET = qsqltds
    22
    3 HEADERS         = ../../../sql/drivers/tds/qsql_tds.h
    4 
    5 SOURCES         = main.cpp \
    6                   ../../../sql/drivers/tds/qsql_tds.cpp
    7 
    8 unix:!contains( LIBS, .*sybdb.* ):LIBS  *= -lsybdb
    9 
    10 win32 {
    11     !win32-borland:LIBS *= -lNTWDBLIB
    12     win32-borland:LIBS  *= $(BCB)/lib/PSDK/NTWDBLIB.LIB
    13 }
     3SOURCES = main.cpp
     4include(../../../sql/drivers/tds/qsql_tds.pri)
    145
    156include(../qsqldriverbase.pri)
Note: See TracChangeset for help on using the changeset viewer.