Title: [99317] trunk
- Revision
- 99317
- Author
- [email protected]
- Date
- 2011-11-04 14:00:11 -0700 (Fri, 04 Nov 2011)
Log Message
[Qt] Remove ENABLE_SQLITE from qmake files
https://bugs.webkit.org/show_bug.cgi?id=71546
Reviewed by Simon Hausmann.
Source/WebCore:
ENABLE_SQLITE is required to build WebCore, so remove conditions.
* Target.pri:
Tools:
* qmake/mkspecs/features/features.prf:
* qmake/mkspecs/features/webcore.prf:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99316 => 99317)
--- trunk/Source/WebCore/ChangeLog 2011-11-04 20:58:00 UTC (rev 99316)
+++ trunk/Source/WebCore/ChangeLog 2011-11-04 21:00:11 UTC (rev 99317)
@@ -1,3 +1,14 @@
+2011-11-04 Patrick Gansterer <[email protected]>
+
+ [Qt] Remove ENABLE_SQLITE from qmake files
+ https://bugs.webkit.org/show_bug.cgi?id=71546
+
+ Reviewed by Simon Hausmann.
+
+ ENABLE_SQLITE is required to build WebCore, so remove conditions.
+
+ * Target.pri:
+
2011-11-04 Nate Chapin <[email protected]>
[V8] Null out V8NPObject::rootObject when the owning
Modified: trunk/Source/WebCore/Target.pri (99316 => 99317)
--- trunk/Source/WebCore/Target.pri 2011-11-04 20:58:00 UTC (rev 99316)
+++ trunk/Source/WebCore/Target.pri 2011-11-04 21:00:11 UTC (rev 99317)
@@ -1120,9 +1120,15 @@
platform/ScrollbarTheme.cpp \
platform/ScrollbarThemeComposite.cpp \
platform/ScrollView.cpp \
- platform/text/SegmentedString.cpp \
platform/SharedBuffer.cpp \
platform/SharedBufferChunkReader.cpp \
+ platform/sql/SQLiteAuthorizer.cpp \
+ platform/sql/SQLiteDatabase.cpp \
+ platform/sql/SQLiteFileSystem.cpp \
+ platform/sql/SQLiteStatement.cpp \
+ platform/sql/SQLiteTransaction.cpp \
+ platform/sql/SQLValue.cpp \
+ platform/text/SegmentedString.cpp \
platform/text/String.cpp \
platform/text/TextBoundaries.cpp \
platform/text/TextCodec.cpp \
@@ -1258,6 +1264,10 @@
rendering/style/StyleSurroundData.cpp \
rendering/style/StyleTransformData.cpp \
rendering/style/StyleVisualData.cpp \
+ storage/AbstractDatabase.cpp \
+ storage/Database.cpp \
+ storage/DatabaseAuthorizer.cpp \
+ storage/DatabaseSync.cpp \
storage/LocalStorageTask.cpp \
storage/LocalStorageThread.cpp \
storage/Storage.cpp \
@@ -2844,27 +2854,6 @@
plugins/PluginViewNone.cpp
}
-contains(DEFINES, ENABLE_SQLITE=1) {
- !system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
- # Build sqlite3 into WebCore from source
- # somewhat copied from $$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite/sqlite.pro
- SOURCES += $${SQLITE3SRCDIR}/sqlite3.c
- }
-
- SOURCES += \
- platform/sql/SQLiteAuthorizer.cpp \
- platform/sql/SQLiteDatabase.cpp \
- platform/sql/SQLiteFileSystem.cpp \
- platform/sql/SQLiteStatement.cpp \
- platform/sql/SQLiteTransaction.cpp \
- platform/sql/SQLValue.cpp \
- storage/AbstractDatabase.cpp \
- storage/Database.cpp \
- storage/DatabaseAuthorizer.cpp \
- storage/DatabaseSync.cpp
-}
-
-
contains(DEFINES, ENABLE_SQL_DATABASE=1) {
SOURCES += \
storage/ChangeVersionWrapper.cpp \
@@ -3813,6 +3802,12 @@
page/PageSerializer.cpp
}
+!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
+ # Build sqlite3 into WebCore from source
+ # somewhat copied from $$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite/sqlite.pro
+ SOURCES += $${SQLITE3SRCDIR}/sqlite3.c
+}
+
win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
asm_compiler.commands = ml64 /c
asm_compiler.commands += /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
Modified: trunk/Tools/ChangeLog (99316 => 99317)
--- trunk/Tools/ChangeLog 2011-11-04 20:58:00 UTC (rev 99316)
+++ trunk/Tools/ChangeLog 2011-11-04 21:00:11 UTC (rev 99317)
@@ -1,3 +1,13 @@
+2011-11-04 Patrick Gansterer <[email protected]>
+
+ [Qt] Remove ENABLE_SQLITE from qmake files
+ https://bugs.webkit.org/show_bug.cgi?id=71546
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/features.prf:
+ * qmake/mkspecs/features/webcore.prf:
+
2011-11-04 Adam Barth <[email protected]>
watchlist for WebIDL shouldn't trigger on Internals.idl
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (99316 => 99317)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2011-11-04 20:58:00 UTC (rev 99316)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2011-11-04 21:00:11 UTC (rev 99317)
@@ -18,9 +18,6 @@
DEFINES += WTF_USE_MEEGOTOUCH=1
}
-# SQLite is required to build WebKit
-DEFINES += ENABLE_SQLITE=1
-
## load mobilityconfig if mobility is available
load(mobilityconfig, true)
Modified: trunk/Tools/qmake/mkspecs/features/webcore.prf (99316 => 99317)
--- trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-11-04 20:58:00 UTC (rev 99316)
+++ trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-11-04 21:00:11 UTC (rev 99317)
@@ -144,18 +144,6 @@
PKGCONFIG += libxml-2.0
}
-contains(DEFINES, ENABLE_SQLITE=1) {
- !system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
- INCLUDEPATH += $${SQLITE3SRCDIR}
- DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE
- CONFIG(release, debug|release): DEFINES *= NDEBUG
- } else {
- INCLUDEPATH += $${SQLITE3SRCDIR}
- LIBS += -lsqlite3
- }
- wince*:DEFINES += HAVE_LOCALTIME_S=0
-}
-
contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
unix {
mac {
@@ -231,6 +219,15 @@
}
}
+!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
+ INCLUDEPATH += $${SQLITE3SRCDIR}
+ DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE
+ CONFIG(release, debug|release): DEFINES *= NDEBUG
+} else {
+ INCLUDEPATH += $${SQLITE3SRCDIR}
+ LIBS += -lsqlite3
+}
+
win32-*|wince* {
DLLDESTDIR = $${ROOT_BUILD_DIR}/bin
isEmpty(QT_SOURCE_TREE):build_pass: TARGET = $$qtLibraryTarget($$TARGET)
@@ -265,6 +262,7 @@
}
wince* {
+ DEFINES += HAVE_LOCALTIME_S=0
LIBS += -lmmtimer
LIBS += -lole32
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
